pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

decomped AC function (#401)

Browse Source 
* rename func_80242178_7ECE88

* matched tiny function

* decomp AC func

* renamed some vars

* made requested changes

* named temp_s0
This commit is contained in:
Muskellunge 2021-08-27 07:44:37 +02:00 committed by GitHub
parent cdbf170061
commit c58b4098f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 30 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -2250,7 +2250,7 @@ typedef struct RenderTaskEntry {
typedef struct ActionCommandStatus { typedef struct ActionCommandStatus {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
/* 0x04 */ struct HudElement* hudElements[15]; /* 0x04 */ s32 hudElements[15];
/* 0x40 */ char unk_40[0x4]; /* 0x40 */ char unk_40[0x4];
/* 0x44 */ s16 unk_44; /* 0x44 */ s16 unk_44;
/* 0x46 */ s16 unk_46; /* 0x46 */ s16 unk_46;

18
src/battle/action_cmd/0A.c
View File

@ -8,6 +8,22 @@ INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A9000_4273B0);
INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A928C_42763C); INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A928C_42763C);
INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A955C_42790C); void func_802A955C_42790C(void) {
ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
s32 renderPosX;
s32 renderPosY;
s32 hudElementID;
draw_hud_element_clipped(actionCommandStatus->hudElements[0]);
hudElementID = actionCommandStatus->hudElements[1];
draw_hud_element_clipped(hudElementID);
get_hud_element_render_pos(hudElementID, &renderPosX, &renderPosY);
if (actionCommandStatus->unk_68 == 0) {
func_80268770(renderPosX, renderPosY, actionCommandStatus->unk_44 / 100);
} else {
func_8026880C(renderPosX, renderPosY, actionCommandStatus->unk_44 / 100);
}
draw_hud_element_clipped(actionCommandStatus->hudElements[2]);
}
#include "common/free_hud_elements.inc.c" #include "common/free_hud_elements.inc.c"

6
src/world/area_mac/mac_00/7EB340.c
View File

@ -2,8 +2,6 @@
#define UNK_ALPHA_FUNC_NPC 6 #define UNK_ALPHA_FUNC_NPC 6
extern s32 mac_00_dojoBattleIDs[];
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340);
/* /*
ApiStatus N(func_80240630_7EB340)(Evt* script, s32 isInitialCall) { ApiStatus N(func_80240630_7EB340)(Evt* script, s32 isInitialCall) {
@ -377,10 +375,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00);
#include "world/common/UnkPositionFunc.inc.c" #include "world/common/UnkPositionFunc.inc.c"
ApiStatus func_80242178_7ECE88(Evt* script, s32 isInitialCall) { ApiStatus N(SetDojoBattle)(Evt* script, s32 isInitialCall) {
Enemy* enemy = script->owner1.enemy; Enemy* enemy = script->owner1.enemy;
gCurrentEncounter.encounterList[enemy->encounterIndex]->battle = mac_00_dojoBattleIDs[get_variable(script, SI_SAVE_VAR(28))]; gCurrentEncounter.encounterList[enemy->encounterIndex]->battle = N(dojoBattleIDs)[get_variable(script, SI_SAVE_VAR(28))];
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/world/area_mac/mac_00/mac_00.h
View File

@ -2,3 +2,5 @@
#include "map.h" #include "map.h"
#define NAMESPACE mac_00 #define NAMESPACE mac_00
extern s32 N(dojoBattleIDs)[];

5
src/world/area_obk/obk_04/BC7EB0.c
View File

@ -49,7 +49,10 @@ INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240C10_BC8A70);
INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240CA0_BC8B00); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240CA0_BC8B00);
INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240D00_BC8B60); ApiStatus func_80240D00_BC8B60(Evt* script, s32 isInitialCall) {
gPlayerData.bootsLevel = 1;
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240D14_BC8B74); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240D14_BC8B74);

0
tools/build/first_ok Normal file
View File

6
ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
View File

@ -201,7 +201,7 @@ glabel D_8024A644_7F5354
.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000024, 0x00000002, 0xFE363C80, 0x00020015, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0002001B, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A30004, 0x00A30001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000024, 0x00000002, 0xFE363C80, 0x00020015, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0002001B, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A30004, 0x00A30001, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel D_8024A6B4_7F53C4 glabel D_8024A6B4_7F53C4
.word 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0x0002001D, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFF, 0x00A30004, 0x00A30001, 0x00000000, 0x00000003, 0x0002001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000015C, 0xFFFFFE94, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A30003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000017C, 0xFFFFFE70, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A30001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_80242178_7ECE88, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0x0002001D, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFF, 0x00A30004, 0x00A30001, 0x00000000, 0x00000003, 0x0002001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000015C, 0xFFFFFE94, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A30003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000017C, 0xFFFFFE70, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A30001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, mac_00_SetDojoBattle, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel D_8024A85C_7F556C glabel D_8024A85C_7F556C
.word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000004, 0x00000001, 0x00000043, 0x00000001, func_802421D0_7ECEE0, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A30003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000136, 0xFFFFFE7A, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A30001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000002D, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000004, 0x00000001, 0x00000043, 0x00000001, func_802421D0_7ECEE0, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A30003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000136, 0xFFFFFE7A, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A30001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000002D, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -213,7 +213,7 @@ glabel D_8024AA04_7F5714
.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000024, 0x00000002, 0xFE363C80, 0x00020016, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0002001C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A40006, 0x00A40002, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000024, 0x00000002, 0xFE363C80, 0x00020016, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0002001C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00A40006, 0x00A40002, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel D_8024AA74_7F5784 glabel D_8024AA74_7F5784
.word 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0x00020024, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFF, 0x00A40006, 0x00A40002, 0x00000000, 0x00000003, 0x00020025, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000015C, 0xFFFFFE94, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A40003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000017C, 0xFFFFFE70, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A40002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_80242178_7ECE88, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0x00020024, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFF, 0x00A40006, 0x00A40002, 0x00000000, 0x00000003, 0x00020025, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000015C, 0xFFFFFE94, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A40003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000017C, 0xFFFFFE70, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A40002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, mac_00_SetDojoBattle, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel D_8024AC1C_7F592C glabel D_8024AC1C_7F592C
.word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000004, 0x00000001, 0x00000043, 0x00000001, func_802421D0_7ECEE0, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A40003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000014A, 0xFFFFFE66, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A40002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000002D, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000004, 0x00000001, 0x00000043, 0x00000001, func_802421D0_7ECEE0, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A40003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000014A, 0xFFFFFE66, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00A40002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000002D, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@ -228,7 +228,7 @@ glabel D_8024B164_7F5E74
.word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000004, 0x00000001, 0x00000043, 0x00000001, func_802421D0_7ECEE0, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000004, 0x00000001, 0x00000043, 0x00000001, func_802421D0_7ECEE0, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel D_8024B1DC_7F5EEC glabel D_8024B1DC_7F5EEC
.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8405C72, 0x00000000, 0x00000024, 0x00000002, 0xF8405C72, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00020017, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00020018, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowChoice, 0x001E0016, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0x00020019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE019C, 0x00000004, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0x00020043, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xF5DE019C, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000004, D_8024A85C_7F556C, 0x00000043, 0x00000003, BindNpcAI, 0x00000004, D_8024A6B4_7F53C4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000005, D_8024AC1C_7F592C, 0x00000043, 0x00000003, BindNpcAI, 0x00000005, D_8024AA74_7F5784, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0002002B, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0002002C, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x0002002D, 0x00000023, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000015C, 0xFFFFFE94, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000177, 0xFFFFFE70, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x000000E1, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_8024B164_7F5E74, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80242178_7ECE88, 0x0000000C, 0x00000002, 0xF5DE019C, 0x00000002, 0x00000043, 0x00000001, StartBattle, 0x00000012, 0x00000000, 0x00000043, 0x00000002, StartBattleWith, 0x0000002C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8405C72, 0x00000000, 0x00000024, 0x00000002, 0xF8405C72, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00020017, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00020018, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowChoice, 0x001E0016, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0x00020019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE019C, 0x00000004, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0x00020043, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xF5DE019C, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000004, D_8024A85C_7F556C, 0x00000043, 0x00000003, BindNpcAI, 0x00000004, D_8024A6B4_7F53C4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000005, D_8024AC1C_7F592C, 0x00000043, 0x00000003, BindNpcAI, 0x00000005, D_8024AA74_7F5784, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0002002B, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0002002C, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x0002002D, 0x00000023, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000003, 0x00A20009, 0x00A20002, 0x00000000, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000015C, 0xFFFFFE94, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000014, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000177, 0xFFFFFE70, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x000000E1, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_8024B164_7F5E74, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, mac_00_SetDojoBattle, 0x0000000C, 0x00000002, 0xF5DE019C, 0x00000002, 0x00000043, 0x00000001, StartBattle, 0x00000012, 0x00000000, 0x00000043, 0x00000002, StartBattleWith, 0x0000002C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
glabel D_8024B5B8_7F62C8 glabel D_8024B5B8_7F62C8
.word 0x00000044, 0x00000001, D_8024B1DC_7F5EEC, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 .word 0x00000044, 0x00000001, D_8024B1DC_7F5EEC, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000

62
ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A955C_42790C.s
View File

@ -1,62 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A955C_42790C
/* 42790C 802A955C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 427910 802A9560 AFB1001C */ sw $s1, 0x1c($sp)
/* 427914 802A9564 3C11802A */ lui $s1, %hi(gActionCommandStatus)
/* 427918 802A9568 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus)
/* 42791C 802A956C AFBF0020 */ sw $ra, 0x20($sp)
/* 427920 802A9570 AFB00018 */ sw $s0, 0x18($sp)
/* 427924 802A9574 0C0511EA */ jal draw_hud_element_clipped
/* 427928 802A9578 8E240004 */ lw $a0, 4($s1)
/* 42792C 802A957C 8E300008 */ lw $s0, 8($s1)
/* 427930 802A9580 0C0511EA */ jal draw_hud_element_clipped
/* 427934 802A9584 0200202D */ daddu $a0, $s0, $zero
/* 427938 802A9588 0200202D */ daddu $a0, $s0, $zero
/* 42793C 802A958C 27A50010 */ addiu $a1, $sp, 0x10
/* 427940 802A9590 0C05126B */ jal get_hud_element_render_pos
/* 427944 802A9594 27A60014 */ addiu $a2, $sp, 0x14
/* 427948 802A9598 86220068 */ lh $v0, 0x68($s1)
/* 42794C 802A959C 14400011 */ bnez $v0, .L802A95E4
/* 427950 802A95A0 3C0451EB */ lui $a0, 0x51eb
/* 427954 802A95A4 96230044 */ lhu $v1, 0x44($s1)
/* 427958 802A95A8 3484851F */ ori $a0, $a0, 0x851f
/* 42795C 802A95AC 00031C00 */ sll $v1, $v1, 0x10
/* 427960 802A95B0 00031403 */ sra $v0, $v1, 0x10
/* 427964 802A95B4 00440018 */ mult $v0, $a0
/* 427968 802A95B8 8FA50014 */ lw $a1, 0x14($sp)
/* 42796C 802A95BC 00031FC3 */ sra $v1, $v1, 0x1f
/* 427970 802A95C0 8FA40010 */ lw $a0, 0x10($sp)
/* 427974 802A95C4 00003810 */ mfhi $a3
/* 427978 802A95C8 00073143 */ sra $a2, $a3, 5
/* 42797C 802A95CC 00C33023 */ subu $a2, $a2, $v1
/* 427980 802A95D0 00063400 */ sll $a2, $a2, 0x10
/* 427984 802A95D4 0C09A1DC */ jal func_80268770
/* 427988 802A95D8 00063403 */ sra $a2, $a2, 0x10
/* 42798C 802A95DC 080AA587 */ j .L802A961C
/* 427990 802A95E0 00000000 */ nop
.L802A95E4:
/* 427994 802A95E4 96230044 */ lhu $v1, 0x44($s1)
/* 427998 802A95E8 3484851F */ ori $a0, $a0, 0x851f
/* 42799C 802A95EC 00031C00 */ sll $v1, $v1, 0x10
/* 4279A0 802A95F0 00031403 */ sra $v0, $v1, 0x10
/* 4279A4 802A95F4 00440018 */ mult $v0, $a0
/* 4279A8 802A95F8 8FA50014 */ lw $a1, 0x14($sp)
/* 4279AC 802A95FC 00031FC3 */ sra $v1, $v1, 0x1f
/* 4279B0 802A9600 8FA40010 */ lw $a0, 0x10($sp)
/* 4279B4 802A9604 00003810 */ mfhi $a3
/* 4279B8 802A9608 00073143 */ sra $a2, $a3, 5
/* 4279BC 802A960C 00C33023 */ subu $a2, $a2, $v1
/* 4279C0 802A9610 00063400 */ sll $a2, $a2, 0x10
/* 4279C4 802A9614 0C09A203 */ jal func_8026880C
/* 4279C8 802A9618 00063403 */ sra $a2, $a2, 0x10
.L802A961C:
/* 4279CC 802A961C 8E24000C */ lw $a0, 0xc($s1)
/* 4279D0 802A9620 0C0511EA */ jal draw_hud_element_clipped
/* 4279D4 802A9624 00000000 */ nop
/* 4279D8 802A9628 8FBF0020 */ lw $ra, 0x20($sp)
/* 4279DC 802A962C 8FB1001C */ lw $s1, 0x1c($sp)
/* 4279E0 802A9630 8FB00018 */ lw $s0, 0x18($sp)
/* 4279E4 802A9634 03E00008 */ jr $ra
/* 4279E8 802A9638 27BD0028 */ addiu $sp, $sp, 0x28

9
ver/us/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D00_BC8B60.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240D00_BC8B60
/* BC8B60 80240D00 24020001 */ addiu $v0, $zero, 1
/* BC8B64 80240D04 3C018011 */ lui $at, %hi(gPlayerData)
/* BC8B68 80240D08 A022F290 */ sb $v0, %lo(gPlayerData)($at)
/* BC8B6C 80240D0C 03E00008 */ jr $ra
/* BC8B70 80240D10 24020002 */ addiu $v0, $zero, 2

2
ver/us/symbol_addrs.txt
View File

@ -7694,7 +7694,7 @@ func_80241E04_7ECB14 = 0x80241E04; // type:func rom:0x7ECB14
func_80241E80_7ECB90 = 0x80241E80; // type:func rom:0x7ECB90 func_80241E80_7ECB90 = 0x80241E80; // type:func rom:0x7ECB90
func_80241FF0_7ECD00 = 0x80241FF0; // type:func rom:0x7ECD00 func_80241FF0_7ECD00 = 0x80241FF0; // type:func rom:0x7ECD00
mac_00_UnkPositionFunc = 0x80242078; // type:func rom:0x7ECD88 mac_00_UnkPositionFunc = 0x80242078; // type:func rom:0x7ECD88
func_80242178_7ECE88 = 0x80242178; // type:func rom:0x7ECE88 mac_00_SetDojoBattle = 0x80242178; // type:func rom:0x7ECE88
func_802421D0_7ECEE0 = 0x802421D0; // type:func rom:0x7ECEE0 func_802421D0_7ECEE0 = 0x802421D0; // type:func rom:0x7ECEE0
func_80242224_7ECF34 = 0x80242224; // type:func rom:0x7ECF34 func_80242224_7ECF34 = 0x80242224; // type:func rom:0x7ECF34
func_80242250_7ECF60 = 0x80242250; // type:func rom:0x7ECF60 func_80242250_7ECF60 = 0x80242250; // type:func rom:0x7ECF60