From 18a2781cf118ef1e79cc560b3c024b234f97d5c6 Mon Sep 17 00:00:00 2001 From: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com> Date: Fri, 6 Aug 2021 13:00:15 +0200 Subject: [PATCH] add ActionCommandStatus, random decomp (#358) --- include/common_structs.h | 36 +++- include/variables.h | 2 + src/196AA0.c | 72 +++----- src/battle/action_cmd/hammer.c | 133 ++++++++++++++- src/battle/area_flo/5B14B0.c | 15 +- src/battle/area_flo/5B16A0.c | 2 +- src/battle/area_iwa/4D01F0.c | 14 +- src/battle/area_jan/573C30.c | 2 +- src/battle/area_omo/512AB0.c | 2 +- src/battle/area_omo/512E50.c | 18 +- src/battle/area_omo3/5573E0.c | 8 +- src/common/FreeHudElements.inc.c | 13 +- src/common/MediGuySpriteRotationFunc.inc.c | 13 ++ src/world/area_end/end_00/DF6A20.c | 25 ++- ver/us/asm/data/battle/area_flo/5B3370.data.s | 2 +- ver/us/asm/data/battle/area_iwa/4D0400.data.s | 4 +- ver/us/asm/data/battle/area_jan/573EE0.data.s | 2 +- ver/us/asm/data/battle/area_omo/5137E0.data.s | 2 +- .../data/world/area_end/end_00/DFB0B0.data.s | 4 +- .../196AA0/CloseActionCommandInfo.s | 4 +- .../196AA0/GetCommandAutoSuccess.s | 4 +- .../asm/nonmatchings/196AA0/func_80268284.s | 4 +- .../asm/nonmatchings/196AA0/func_80268938.s | 4 +- .../asm/nonmatchings/196AA0/func_80268AF8.s | 2 +- .../asm/nonmatchings/196AA0/func_80268C9C.s | 6 +- .../asm/nonmatchings/196AA0/func_80268E88.s | 4 +- .../asm/nonmatchings/196AA0/func_80269118.s | 4 +- .../asm/nonmatchings/196AA0/func_80269160.s | 4 +- .../asm/nonmatchings/196AA0/func_802694A4.s | 4 +- .../action_cmd/07/func_802A9000_425B50.s | 4 +- .../action_cmd/07/func_802A916C_425CBC.s | 4 +- .../action_cmd/07/func_802A9228_425D78.s | 4 +- .../action_cmd/07/func_802A94D8_426028.s | 4 +- .../action_cmd/0A/func_802A9000_4273B0.s | 4 +- .../action_cmd/0A/func_802A9170_427520.s | 4 +- .../action_cmd/0A/func_802A928C_42763C.s | 4 +- .../action_cmd/0A/func_802A955C_42790C.s | 4 +- .../air_lift/func_802A9000_428A70.s | 4 +- .../air_lift/func_802A9184_428BF4.s | 4 +- .../air_lift/func_802A9278_428CE8.s | 4 +- .../air_lift/func_802A96EC_42915C.s | 4 +- .../air_raid/func_802A9000_429320.s | 4 +- .../air_raid/func_802A9178_429498.s | 4 +- .../air_raid/func_802A9294_4295B4.s | 4 +- .../air_raid/func_802A984C_429B6C.s | 4 +- .../body_slam/func_802A9000_4282E0.s | 4 +- .../body_slam/func_802A91B8_428498.s | 4 +- .../body_slam/func_802A92D4_4285B4.s | 4 +- .../body_slam/func_802A9664_428944.s | 4 +- .../body_slam/func_802A9708_4289E8.s | 4 +- .../action_cmd/bomb/func_802A9000_427A70.s | 4 +- .../action_cmd/bomb/func_802A9170_427BE0.s | 4 +- .../action_cmd/bomb/func_802A928C_427CFC.s | 4 +- .../action_cmd/bomb/func_802A96EC_42815C.s | 4 +- .../break_free/func_802A9000_4233F0.s | 4 +- .../break_free/func_802A91B0_4235A0.s | 4 +- .../break_free/func_802A92DC_4236CC.s | 4 +- .../break_free/func_802A96B8_423AA8.s | 4 +- .../break_free/func_802A97FC_423BEC.s | 4 +- .../dizzy_shell/func_802A9000_426170.s | 4 +- .../dizzy_shell/func_802A9170_4262E0.s | 4 +- .../dizzy_shell/func_802A928C_4263FC.s | 4 +- .../dizzy_shell/func_802A96DC_42684C.s | 4 +- .../fire_shell/func_802A9000_4269D0.s | 4 +- .../fire_shell/func_802A9178_426B48.s | 4 +- .../fire_shell/func_802A9294_426C64.s | 4 +- .../fire_shell/func_802A9834_427204.s | 4 +- .../action_cmd/flee/func_802A9000_422AD0.s | 4 +- .../action_cmd/flee/func_802A92A0_422D70.s | 4 +- .../action_cmd/flee/func_802A9378_422E48.s | 4 +- .../action_cmd/flee/func_802A96F4_4231C4.s | 4 +- .../action_cmd/flee/func_802A9894_423364.s | 4 +- .../action_cmd/hammer/func_802A9000_422000.s | 156 ------------------ .../action_cmd/hammer/func_802A9258_422258.s | 76 --------- .../action_cmd/hammer/func_802A936C_42236C.s | 4 +- .../action_cmd/hammer/func_802A99D4_4229D4.s | 27 --- .../action_cmd/hammer/func_802A9A30_422A30.s | 28 ---- .../hurricane/func_802A9000_42F6E0.s | 4 +- .../hurricane/func_802A91A0_42F880.s | 4 +- .../hurricane/func_802A92A0_42F980.s | 4 +- .../hurricane/func_802A97AC_42FE8C.s | 4 +- .../hurricane/func_802A9894_42FF74.s | 4 +- .../action_cmd/jump/func_802A9000_4219F0.s | 4 +- .../action_cmd/jump/func_802A9120_421B10.s | 4 +- .../action_cmd/jump/func_802A9234_421C24.s | 4 +- .../action_cmd/jump/func_802A9544_421F34.s | 4 +- .../action_cmd/jump/func_802A9590_421F80.s | 4 +- .../mega_shock/func_802A9000_42DA10.s | 4 +- .../mega_shock/func_802A91A0_42DBB0.s | 4 +- .../mega_shock/func_802A92A0_42DCB0.s | 4 +- .../mega_shock/func_802A97F8_42E208.s | 4 +- .../mega_shock/func_802A98E0_42E2F0.s | 4 +- .../power_shock/func_802A9000_42CF10.s | 4 +- .../power_shock/func_802A9210_42D120.s | 4 +- .../power_shock/func_802A9310_42D220.s | 4 +- .../power_shock/func_802A98D0_42D7E0.s | 4 +- .../power_shock/func_802A9A54_42D964.s | 4 +- .../action_cmd/smack/func_802A9000_42E3A0.s | 4 +- .../action_cmd/smack/func_802A917C_42E51C.s | 4 +- .../action_cmd/smack/func_802A9298_42E638.s | 4 +- .../action_cmd/smack/func_802A98B0_42EC50.s | 4 +- .../spiny_surge/func_802A9000_42EE20.s | 4 +- .../spiny_surge/func_802A916C_42EF8C.s | 4 +- .../spiny_surge/func_802A9254_42F074.s | 4 +- .../spiny_surge/func_802A973C_42F55C.s | 4 +- .../action_cmd/spook/func_802A9000_430020.s | 4 +- .../action_cmd/spook/func_802A917C_43019C.s | 4 +- .../action_cmd/spook/func_802A9298_4302B8.s | 4 +- .../action_cmd/spook/func_802A97FC_43081C.s | 4 +- .../action_cmd/squirt/func_802A9000_429D20.s | 4 +- .../action_cmd/squirt/func_802A911C_429E3C.s | 4 +- .../action_cmd/squirt/func_802A9208_429F28.s | 4 +- .../action_cmd/squirt/func_802A9634_42A354.s | 4 +- .../action_cmd/squirt/func_802A9720_42A440.s | 4 +- .../stop_leech/func_802A9000_425590.s | 4 +- .../stop_leech/func_802A9110_4256A0.s | 4 +- .../stop_leech/func_802A91F8_425788.s | 4 +- .../stop_leech/func_802A94A4_425A34.s | 4 +- .../stop_leech/func_802A9544_425AD4.s | 4 +- .../tidal_wave/func_802A9000_42C6F0.s | 4 +- .../tidal_wave/func_802A9138_42C828.s | 4 +- .../tidal_wave/func_802A9228_42C918.s | 4 +- .../tidal_wave/func_802A9764_42CE54.s | 4 +- .../water_block/func_802A9000_42A4F0.s | 4 +- .../water_block/func_802A9398_42A888.s | 4 +- .../water_block/func_802A948C_42A97C.s | 4 +- .../water_block/func_802AA014_42B504.s | 4 +- .../water_block/func_802AA0D8_42B5C8.s | 4 +- .../whirlwind/func_802A9000_423C70.s | 4 +- .../whirlwind/func_802A91E0_423E50.s | 4 +- .../whirlwind/func_802A92F0_423F60.s | 4 +- .../whirlwind/func_802A9744_4243B4.s | 4 +- .../whirlwind/func_802A9898_424508.s | 4 +- .../area_flo/5B14B0/func_802180CC_5B157C.s | 77 --------- .../area_flo/5B16A0/func_8021844C_5B18FC.s | 73 -------- .../area_iwa/4D01F0/func_80218000_4D01F0.s | 29 ---- .../area_jan/573C30/func_802183DC_573CFC.s | 73 -------- .../area_omo/512AB0/func_802185AC_512B7C.s | 73 -------- .../area_omo/512E50/func_80218CF4_5132C4.s | 31 ---- .../area_omo3/5573E0/func_80218000_5573E0.s | 18 -- .../partner/parakarry/func_80238000_6FFD80.s | 4 +- .../end_00/DF6A20/func_80242830_DF9230.s | 30 ---- .../end_00/DF6A20/func_80242898_DF9298.s | 31 ---- ver/us/symbol_addrs.txt | 18 +- ver/us/undefined_syms_auto.txt | 2 +- 145 files changed, 518 insertions(+), 1037 deletions(-) create mode 100644 src/common/MediGuySpriteRotationFunc.inc.c delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9000_422000.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9258_422258.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A99D4_4229D4.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9A30_422A30.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_flo/5B14B0/func_802180CC_5B157C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_flo/5B16A0/func_8021844C_5B18FC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_iwa/4D01F0/func_80218000_4D01F0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_jan/573C30/func_802183DC_573CFC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218CF4_5132C4.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_omo3/5573E0/func_80218000_5573E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830_DF9230.s delete mode 100644 ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242898_DF9298.s diff --git a/include/common_structs.h b/include/common_structs.h index ab44f8f46e..7a86bd6d8c 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -692,9 +692,9 @@ typedef struct BattleStatus { /* 0x0A8 */ s32 cloudNineEffect; /* 0x0AC */ char unk_AC; /* 0x0AD */ s8 unk_AD; - /* 0x0AE */ u8 hammerLossTurns; - /* 0x0AF */ u8 jumpLossTurns; - /* 0x0B0 */ u8 itemLossTurns; + /* 0x0AE */ s8 hammerLossTurns; + /* 0x0AF */ s8 jumpLossTurns; + /* 0x0B0 */ s8 itemLossTurns; /* 0x0B1 */ char unk_B1[3]; /* 0x0B4 */ UNK_FUN_PTR(preUpdateCallback); /* 0x0B8 */ UNK_FUN_PTR(unk_B8); @@ -2231,4 +2231,34 @@ typedef struct RenderTaskEntry { /* 0x0C */ void (*appendGfx)(void*); } RenderTaskEntry; // size = 0x10 +typedef struct ActionCommandStatus { + /* 0x00 */ s32 unk_00; + /* 0x04 */ HudElement* hudElements[7]; + /* 0x20 */ char unk_20[0x2A]; + /* 0x4A */ s16 actionCommandID; // current action command id? + /* 0x4C */ s16 unk_4C; + /* 0x4E */ s16 unk_4E; + /* 0x50 */ s16 unk_50; + /* 0x52 */ s16 unk_52; + /* 0x54 */ s16 unk_54; + /* 0x56 */ s16 hudElementX; + /* 0x58 */ s16 hudElementY; + /* 0x59 */ char unk_59[4]; + /* 0x5E */ s8 autoSucceed; + /* 0x5F */ s8 unk_5F; + /* 0x60 */ s8 unk_60; + /* 0x61 */ s8 unk_61; + /* 0x62 */ s8 unk_62; + /* 0x63 */ s8 unk_63; + /* 0x64 */ s16 unk_64; + /* 0x66 */ s16 unk_66; + /* 0x68 */ s16 unk_68; + /* 0x6A */ s16 unk_6A; + /* 0x6C */ s16 unk_6C; + /* 0x6E */ s16 hitsTakenIsMax; + /* 0x70 */ char unk_70[4]; + /* 0x74 */ s16 unk_74; + /* 0x76 */ s16 mashMeterCutoffs[5]; // upper bounds for each interval + /* 0x80 */ s8 mashMeterIntervals; +} ActionCommandStatus; // size unknown #endif diff --git a/include/variables.h b/include/variables.h index 852db27f3d..2bd9cacec1 100644 --- a/include/variables.h +++ b/include/variables.h @@ -37,6 +37,8 @@ extern s32 D_800DC4F4; extern s32 D_800DC4F8; extern s32 gBattleDmaDest; +extern ActionCommandStatus gActionCommandStatus; + extern ScriptList gWorldScriptList; extern ScriptList gBattleScriptList; extern ScriptList* gCurrentScriptListPtr; diff --git a/src/196AA0.c b/src/196AA0.c index b8cbcb9ea4..75e6099411 100644 --- a/src/196AA0.c +++ b/src/196AA0.c @@ -28,34 +28,6 @@ enum ActionCommand { ACTION_COMMAND_TIDAL_WAVE, }; -// action command state -extern struct D_8029FBE0 { - /* 0x00 */ char unk_00[0x4A]; - /* 0x4A */ s16 unk_4A; // current action command id? - /* 0x4C */ s16 unk_4C; - /* 0x4E */ char unk_4E[0x10]; - /* 0x5E */ s8 unk_5E; - /* 0x5F */ s8 unk_5F; - /* 0x60 */ s8 unk_60; - /* 0x61 */ s8 unk_61; - /* 0x62 */ s16 unk_62; - /* 0x64 */ s16 unk_64; - /* 0x66 */ s16 unk_66; - /* 0x68 */ s16 unk_68; - /* 0x6A */ s16 unk_6A; - /* 0x6C */ s16 unk_6C; - /* 0x6E */ s16 hitsTakenIsMax; - /* 0x70 */ char unk_70[2]; - /* 0x72 */ char unk_72[2]; - /* 0x74 */ s16 unk_74; - /* 0x76 */ s16 unk_76; - /* 0x78 */ s16 unk_78; - /* 0x7A */ s16 unk_7A; - /* 0x7C */ s16 unk_7C; - /* 0x7E */ s16 unk_7E; - /* 0x80 */ s8 unk_80; -} D_8029FBE0; // size unknown - extern void* actionCommandDmaTable[23]; extern s32 D_8029FBC0; @@ -114,33 +86,33 @@ void func_80268834(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { } void func_80268858(void) { - struct D_8029FBE0* d8029FBE0 = &D_8029FBE0; + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; - d8029FBE0->unk_5E = FALSE; - d8029FBE0->unk_6A = FALSE; + actionCommandStatus->autoSucceed = FALSE; + actionCommandStatus->unk_6A = FALSE; if (!(gBattleStatus.flags1 & 0x80000)) { if (is_ability_active(ABILITY_RIGHT_ON)) { - d8029FBE0->unk_5E = TRUE; + actionCommandStatus->autoSucceed = TRUE; } if (!(gBattleStatus.flags1 & 0x80000) && is_ability_active(ABILITY_BERSERKER)) { - d8029FBE0->unk_61 = FALSE; - d8029FBE0->unk_6A = TRUE; + actionCommandStatus->unk_61 = FALSE; + actionCommandStatus->unk_6A = TRUE; if (rand_int(100) < 25) { - d8029FBE0->unk_5E = TRUE; + actionCommandStatus->autoSucceed = TRUE; } } } if (gGameStatusPtr->demoFlags & 1) { - d8029FBE0->unk_5E = TRUE; + actionCommandStatus->autoSucceed = TRUE; } if (gBattleStatus.flags1 & 0x1000) { - d8029FBE0->unk_5E = TRUE; - d8029FBE0->unk_61 = FALSE; + actionCommandStatus->autoSucceed = TRUE; + actionCommandStatus->unk_61 = FALSE; } } @@ -153,7 +125,7 @@ void func_80268938(void) { func_80268C9C(); } - ac = D_8029FBE0.unk_4A; + ac = gActionCommandStatus.unk_4A; switch (ac) { case ACTION_COMMAND_JUMP: @@ -240,7 +212,7 @@ INCLUDE_ASM(s32, "196AA0", func_80268E88); s32 check_block_input(s32 buttonMask) { BattleStatus* battleStatus = &gBattleStatus; PlayerData* playerData = &gPlayerData; - struct D_8029FBE0* d8029FBE0 = &D_8029FBE0; + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 mashWindow; s32 blockWindow; s32 block; @@ -262,9 +234,9 @@ s32 check_block_input(s32 buttonMask) { if (playerData->hitsTaken < 9999) { playerData->hitsTaken += 1; - d8029FBE0->hitsTakenIsMax = FALSE; + actionCommandStatus->hitsTakenIsMax = FALSE; } else { - d8029FBE0->hitsTakenIsMax = TRUE; + actionCommandStatus->hitsTakenIsMax = TRUE; } block = FALSE; @@ -334,7 +306,7 @@ s32 check_block_input(s32 buttonMask) { bufferPos++; } } - if (block && !d8029FBE0->hitsTakenIsMax) { + if (block && !actionCommandStatus->hitsTakenIsMax) { playerData->hitsBlocked += 1; } @@ -352,13 +324,13 @@ ApiStatus func_8026919C(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetupMashMeter(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - D_8029FBE0.unk_80 = get_variable(script, *args++); - D_8029FBE0.unk_76 = get_variable(script, *args++); - D_8029FBE0.unk_78 = get_variable(script, *args++); - D_8029FBE0.unk_7A = get_variable(script, *args++); - D_8029FBE0.unk_7C = get_variable(script, *args++); - D_8029FBE0.unk_7E = get_variable(script, *args++); - D_8029FBE0.unk_74 = D_8029FBE0.unk_76 / 2; + gActionCommandStatus.mashMeterIntervals = get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[0] = get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[1] = get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[2] = get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[3] = get_variable(script, *args++); + gActionCommandStatus.mashMeterCutoffs[4] = get_variable(script, *args++); + gActionCommandStatus.unk_74 = gActionCommandStatus.mashMeterCutoffs[0] / 2; return ApiStatus_DONE2; } diff --git a/src/battle/action_cmd/hammer.c b/src/battle/action_cmd/hammer.c index 833bc870ee..7f6e41d236 100644 --- a/src/battle/action_cmd/hammer.c +++ b/src/battle/action_cmd/hammer.c @@ -2,12 +2,137 @@ #define NAMESPACE action_command_hammer -INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A9000_422000); +extern s32 D_80108E48; +// icon indexes for hud elements +extern s32 D_802922F0; +extern s32 D_8029275C; +extern s32 D_802927F0; +extern s32 D_80292848; +extern s32 D_802928A0; +extern s32 D_80292A2C; -INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A9258_422258); +extern s32 D_802941E0; + +ApiStatus N(CreateHudElements)(void) { + HudElement* hudElement; + + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + + battleStatus->unk_82 = 1; + battleStatus->unk_434 = &D_802941E0; + battleStatus->unk_86 = 0; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + battleStatus->unk_84 = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + actionCommandStatus->actionCommandID = 2; + actionCommandStatus->hudElementX = -0x30; + actionCommandStatus->unk_4C = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->hudElementY = 0x60; + + hudElement = create_hud_element(&D_802922F0); + actionCommandStatus->hudElements[0] = hudElement; + set_hud_element_flags(hudElement, 0x82); + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0xA); + + hudElement = create_hud_element(&D_8029275C); + actionCommandStatus->hudElements[1] = hudElement; + set_hud_element_flags(hudElement, 0x82); + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + + hudElement = create_hud_element(&D_802927F0); + actionCommandStatus->hudElements[2] = hudElement; + set_hud_element_flags(hudElement, 0x82); + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + + hudElement = create_hud_element(&D_80292848); + actionCommandStatus->hudElements[3] = hudElement; + set_hud_element_flags(hudElement, 0x82); + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + + hudElement = create_hud_element(&D_802928A0); + actionCommandStatus->hudElements[4] = hudElement; + set_hud_element_flags(hudElement, 0x82); + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + + hudElement = create_hud_element(&D_80108E48); + actionCommandStatus->hudElements[5] = hudElement; + set_hud_element_flags(hudElement, 0x82); + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + + hudElement = create_hud_element(&D_80292A2C); + actionCommandStatus->hudElements[6] = hudElement; + set_hud_element_flags(hudElement, 0x82); + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_alpha(hudElement, 0xFF); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A9258_422258(ScriptInstance* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + Bytecode* args = script->ptrReadPos; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + battleStatus->unk_84 = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + actionCommandStatus->unk_4E = get_variable(script, *args++); + actionCommandStatus->unk_52 = get_variable(script, *args++); + actionCommandStatus->unk_50 = get_variable(script, *args); + actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); + actionCommandStatus->unk_60 = 0; + actionCommandStatus->unk_62 = 1; + if (actionCommandStatus->unk_4E < 0) { + actionCommandStatus->unk_4E = 0; + actionCommandStatus->unk_62 = 0; + } + + actionCommandStatus->unk_5F = 0; + battleStatus->actionSuccess = 0; + battleStatus->unk_84 = 0; + battleStatus->unk_86 = 0; + actionCommandStatus->unk_4C = 0xA; + battleStatus->flags1 &= ~0x8000; + func_80269118(); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A936C_42236C); -INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A99D4_4229D4); +void N(DrawHudElements)(void) { + draw_hud_element_clipped(gActionCommandStatus.hudElements[0]); + draw_hud_element_clipped(gActionCommandStatus.hudElements[1]); + draw_hud_element_clipped(gActionCommandStatus.hudElements[2]); + draw_hud_element_clipped(gActionCommandStatus.hudElements[3]); + draw_hud_element_clipped(gActionCommandStatus.hudElements[4]); + draw_hud_element_clipped(gActionCommandStatus.hudElements[5]); + draw_hud_element_clipped(gActionCommandStatus.hudElements[6]); +} -INCLUDE_ASM(s32, "battle/action_cmd/hammer", func_802A9A30_422A30); +void N(FreeHudElements)(void) { + free_hud_element(gActionCommandStatus.hudElements[0]); + free_hud_element(gActionCommandStatus.hudElements[1]); + free_hud_element(gActionCommandStatus.hudElements[2]); + free_hud_element(gActionCommandStatus.hudElements[3]); + free_hud_element(gActionCommandStatus.hudElements[4]); + free_hud_element(gActionCommandStatus.hudElements[5]); + free_hud_element(gActionCommandStatus.hudElements[6]); +} diff --git a/src/battle/area_flo/5B14B0.c b/src/battle/area_flo/5B14B0.c index 28183b1883..42708fca0f 100644 --- a/src/battle/area_flo/5B14B0.c +++ b/src/battle/area_flo/5B14B0.c @@ -4,4 +4,17 @@ #include "common/UnkBattleFunc1.inc.c" -INCLUDE_ASM(s32, "battle/area_flo/5B14B0", func_802180CC_5B157C); +ApiStatus func_802180CC_5B157C(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 prevX = get_variable(script, *args++); + s32 prevZ = get_variable(script, *args++); + s32 length = get_variable(script, *args++); + s32 angle = get_variable(script, *args++); + + f32 outX = prevX + (length * cos_deg(angle)); + f32 outZ = prevZ - (length * sin_deg(angle)); + + set_float_variable(script, *args++, outX); + set_float_variable(script, *args++, outZ); + return ApiStatus_DONE2; +} diff --git a/src/battle/area_flo/5B16A0.c b/src/battle/area_flo/5B16A0.c index 3d8bff4470..fb56b75548 100644 --- a/src/battle/area_flo/5B16A0.c +++ b/src/battle/area_flo/5B16A0.c @@ -8,4 +8,4 @@ #include "common/UnkBattleFunc1.inc.c" #define NAMESPACE b_area_flo -INCLUDE_ASM(s32, "battle/area_flo/5B16A0", func_8021844C_5B18FC); +#include "common/MediGuySpriteRotationFunc.inc.c" diff --git a/src/battle/area_iwa/4D01F0.c b/src/battle/area_iwa/4D01F0.c index 3b0f30c168..28ef9ed73a 100644 --- a/src/battle/area_iwa/4D01F0.c +++ b/src/battle/area_iwa/4D01F0.c @@ -1,7 +1,19 @@ #include "common.h" +#include "battle/battle.h" #define NAMESPACE b_area_iwa -INCLUDE_ASM(s32, "battle/area_iwa/4D01F0", func_80218000_4D01F0); +ApiStatus N(SetSpinSmashable)(ScriptInstance* script, s32 isInitialCall) { + s32 canSpinSmash = get_variable(script, *script->ptrReadPos); + Actor* actor = get_actor(script->owner1.actorID); + + if (canSpinSmash == FALSE) { + actor->staticActorData->spinSmashReq = 4; + } else { + actor->staticActorData->spinSmashReq = 0; + } + + return ApiStatus_DONE2; +} #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_jan/573C30.c b/src/battle/area_jan/573C30.c index df8210263f..d05f3644f2 100644 --- a/src/battle/area_jan/573C30.c +++ b/src/battle/area_jan/573C30.c @@ -4,4 +4,4 @@ #include "common/UnkBattleFunc1.inc.c" -INCLUDE_ASM(s32, "battle/area_jan/573C30", func_802183DC_573CFC); +#include "common/MediGuySpriteRotationFunc.inc.c" diff --git a/src/battle/area_omo/512AB0.c b/src/battle/area_omo/512AB0.c index 4cd98dcaed..b1db554105 100644 --- a/src/battle/area_omo/512AB0.c +++ b/src/battle/area_omo/512AB0.c @@ -6,4 +6,4 @@ #include "common/UnkBattleFunc1.inc.c" #define NAMESPACE b_area_omo -INCLUDE_ASM(s32, "battle/area_omo/512AB0", func_802185AC_512B7C); +#include "common/MediGuySpriteRotationFunc.inc.c" diff --git a/src/battle/area_omo/512E50.c b/src/battle/area_omo/512E50.c index d787066e41..750c5cbce8 100644 --- a/src/battle/area_omo/512E50.c +++ b/src/battle/area_omo/512E50.c @@ -8,6 +8,22 @@ INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218880_512E50); INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218B38_513108); -INCLUDE_ASM(s32, "battle/area_omo/512E50", func_80218CF4_5132C4); +/// checks if all actions are available. +/// used by Spy Guys. +ApiStatus func_80218CF4_5132C4(ScriptInstance* script, s32 isInitialCall) { + BattleStatus* status = &gBattleStatus; + Bytecode* args = script->ptrReadPos; + + if (status->hammerLossTurns == -1 || + status->jumpLossTurns == -1 || + status->itemLossTurns == -1 + ) { + set_variable(script, *args++, 0); + } else { + set_variable(script, *args++, -1); + } + + return ApiStatus_DONE2; +} #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/area_omo3/5573E0.c b/src/battle/area_omo3/5573E0.c index 070d8c73a8..c57ca44e76 100644 --- a/src/battle/area_omo3/5573E0.c +++ b/src/battle/area_omo3/5573E0.c @@ -2,7 +2,13 @@ #define NAMESPACE b_area_omo3 -INCLUDE_ASM(s32, "battle/area_omo3/5573E0", func_80218000_5573E0); +ApiStatus func_80218000_5573E0(ScriptInstance* script, s32 isInitialCall) { + get_actor(script->owner1.actorID); + + set_screen_overlay_params_back(13, 220.0f); + set_screen_overlay_alpha(1, 200.0f); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/area_omo3/5573E0", func_80218038_557418); diff --git a/src/common/FreeHudElements.inc.c b/src/common/FreeHudElements.inc.c index 5d7184ba77..0c2a1e7465 100644 --- a/src/common/FreeHudElements.inc.c +++ b/src/common/FreeHudElements.inc.c @@ -1,15 +1,8 @@ #include "common.h" -extern struct D_8029FBE0 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ s32 unk_08; - /* 0x0C */ s32 unk_0C; -} D_8029FBE0; // size = 0x10 - void N(FreeHudElements)(void) { - free_hud_element(D_8029FBE0.unk_04); - free_hud_element(D_8029FBE0.unk_08); - free_hud_element(D_8029FBE0.unk_0C); + free_hud_element(gActionCommandStatus.hudElements[0]); + free_hud_element(gActionCommandStatus.hudElements[1]); + free_hud_element(gActionCommandStatus.hudElements[2]); } diff --git a/src/common/MediGuySpriteRotationFunc.inc.c b/src/common/MediGuySpriteRotationFunc.inc.c new file mode 100644 index 0000000000..a3e90c8151 --- /dev/null +++ b/src/common/MediGuySpriteRotationFunc.inc.c @@ -0,0 +1,13 @@ +// outputs z sprite rotation +ApiStatus N(MediGuySpriteRotationFunc)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + s32 angle = get_variable(script, *args++); + s32 outPos = *(args++); + s32 temp_s3 = get_variable(script, *args++); + s32 temp_s0_5 = get_variable(script, *args++); + f32 temp_f20 = get_float_variable(script, *args++) * (1.0f - (angle / (f32) temp_s0_5)); + + set_variable(script, outPos, temp_f20 * cos_rad((angle * 6.283184f) / temp_s3)); + return ApiStatus_DONE2; +} diff --git a/src/world/area_end/end_00/DF6A20.c b/src/world/area_end/end_00/DF6A20.c index a9c4293e9e..cbac0357c1 100644 --- a/src/world/area_end/end_00/DF6A20.c +++ b/src/world/area_end/end_00/DF6A20.c @@ -66,6 +66,27 @@ ApiStatus func_802427D8_DF91D8(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242830_DF9230); +ApiStatus N(SetNpcShadowScale)(ScriptInstance* script, s32 isInitialCall) { + s32 npcID; + f32 newShadowScale; -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242898_DF9298); + Bytecode* args = script->ptrReadPos; + npcID = get_variable(script, *args++); + newShadowScale = get_float_variable(script, *args++); + + resolve_npc(script, npcID)->shadowScale = newShadowScale; + return ApiStatus_DONE2; +} + +ApiStatus func_80242898_DF9298(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + Npc** npc = &script->functionTemp[1]; + + if (isInitialCall) { + *npc = get_npc_unsafe(get_variable(script, *args++)); + } + + (*npc)->pos.x += 0.6666667f; + + return ApiStatus_BLOCK; +} diff --git a/ver/us/asm/data/battle/area_flo/5B3370.data.s b/ver/us/asm/data/battle/area_flo/5B3370.data.s index e4cd88bbea..f29bf373b5 100644 --- a/ver/us/asm/data/battle/area_flo/5B3370.data.s +++ b/ver/us/asm/data/battle/area_flo/5B3370.data.s @@ -270,7 +270,7 @@ glabel D_802239A0_5BCE50 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0xFFFFFF81, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoNormalHit, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400008, 0x00000025, 0x00000002, 0xFE363C82, 0x00400009, 0x00000046, 0x00000001, DoBurnHit, 0x00000016, 0x00000001, 0x00000024, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400008, 0x00000025, 0x00000002, 0xFE363C82, 0x00400009, 0x00000046, 0x00000001, DoBurnHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400009, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000000B, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000016, 0x00000001, 0x00000021, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoShockHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoJumpBack, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8A80, 0x00000046, 0x00000001, D_802238DC_5BCD8C, 0x00000016, 0x00000001, 0x00000026, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoShockHit, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x0000001D, 0x00000001, 0x0000001F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400001, 0x00000046, 0x00000001, DoImmune, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000020, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoNormalHit, 0x00000008, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000038, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HPBarToCurrent, 0xFFFFFF81, 0x00000016, 0x00000001, 0x00000035, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_802238DC_5BCD8C, 0x00000043, 0x00000002, HPBarToHome, 0xFFFFFF81, 0x00000016, 0x00000001, 0x00000031, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400001, 0x00000046, 0x00000001, DoRecover, 0x00000016, 0x00000001, 0x00000039, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00000200, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400003, 0x00000025, 0x00000002, 0xFE363C82, 0x0040000B, 0x00000046, 0x00000001, DoScareAway, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000003A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoAirLift, 0x00000016, 0x00000001, 0x00000016, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoBlowAway, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80223F50_5BD400 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000004, func_8024ECF8, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000000F, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400003, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFFC, 0x0000000C, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8A, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, func_8021844C_5B18FC, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x0000003C, 0xF24AF280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24AA280, 0x00000046, 0x00000001, D_802238DC_5BCD8C, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, JumpWithBounce, 0xFFFFFF81, 0x0000000A, 0xF24A8280, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_802238DC_5BCD8C, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000004, func_8024ECF8, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000000F, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400003, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFFC, 0x0000000C, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8A, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, b_area_flo_MediGuySpriteRotationFunc, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x0000003C, 0xF24AF280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24AA280, 0x00000046, 0x00000001, D_802238DC_5BCD8C, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, JumpWithBounce, 0xFFFFFF81, 0x0000000A, 0xF24A8280, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_802238DC_5BCD8C, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80224738_5BDBE8 .word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C80, 0x00000043, 0x00000005, GetActorPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000214, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000027, 0x00000002, 0xFE363C82, 0x00000032, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFE363C8A, 0x00000043, 0x00000003, GetEnemyMaxHP, 0xFE363C8A, 0xFE363C84, 0x00000029, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000064, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x0000206D, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x00000214, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x0000025C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8026BF48, 0x00000001, 0x00000043, 0x00000004, HealActor, 0xFE363C8A, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, func_8026BF48, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, WaitForBuffDone, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/area_iwa/4D0400.data.s b/ver/us/asm/data/battle/area_iwa/4D0400.data.s index 955b6353ac..1965623248 100644 --- a/ver/us/asm/data/battle/area_iwa/4D0400.data.s +++ b/ver/us/asm/data/battle/area_iwa/4D0400.data.s @@ -75,13 +75,13 @@ glabel D_80218934_4D0B24 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80218944_4D0B34 -.word 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300007, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000010, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFDC, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7FB4, 0x00000028, 0x00000002, 0xFE363C81, 0x00000006, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000014, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, b_area_iwa_StartRumbleWithParams, 0x000000C8, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000008, 0xF24A7A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300003, 0x00000043, 0x00000004, SetIdleAnimations, 0xFFFFFF81, 0x00000001, D_80218884_4D0A74, 0x00000043, 0x00000004, SetDefenseTable, 0xFFFFFF81, 0x00000001, D_8021872C_4D091C, 0x00000043, 0x00000005, SetTargetOffset, 0xFFFFFF81, 0x00000001, 0x00000000, 0x0000000F, 0x00000043, 0x00000005, func_8027D4C8, 0xFFFFFF81, 0x00000001, 0x00000000, 0xFFFFFFF9, 0x00000043, 0x00000005, SetPartEventBits, 0xFFFFFF81, 0x00000001, 0x00000010, 0x00000000, 0x00000043, 0x00000002, func_80218000_4D01F0, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00000400, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300007, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000010, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFDC, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7FB4, 0x00000028, 0x00000002, 0xFE363C81, 0x00000006, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000014, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, b_area_iwa_StartRumbleWithParams, 0x000000C8, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000008, 0xF24A7A80, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300003, 0x00000043, 0x00000004, SetIdleAnimations, 0xFFFFFF81, 0x00000001, D_80218884_4D0A74, 0x00000043, 0x00000004, SetDefenseTable, 0xFFFFFF81, 0x00000001, D_8021872C_4D091C, 0x00000043, 0x00000005, SetTargetOffset, 0xFFFFFF81, 0x00000001, 0x00000000, 0x0000000F, 0x00000043, 0x00000005, func_8027D4C8, 0xFFFFFF81, 0x00000001, 0x00000000, 0xFFFFFFF9, 0x00000043, 0x00000005, SetPartEventBits, 0xFFFFFF81, 0x00000001, 0x00000010, 0x00000000, 0x00000043, 0x00000002, b_area_iwa_SetSpinSmashable, 0x00000000, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00000400, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80218C3C_4D0E2C .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0xFFFFFF81, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetLastElement, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001F, 0x00000001, 0x00000200, 0x00000046, 0x00000001, D_80218944_4D0B34, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000013, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000046, 0x00000001, DoNormalHit, 0x00000023, 0x00000000, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000000E, 0x00000043, 0x00000002, GetLastElement, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001F, 0x00000001, 0x00000200, 0x00000046, 0x00000001, D_80218944_4D0B34, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetPartEventBits, 0xFFFFFF81, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000025, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000046, 0x00000001, DoBurnHit, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000025, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000046, 0x00000001, DoBurnHit, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetPartEventBits, 0xFFFFFF81, 0x00000001, 0x00000200, 0x00000000, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000024, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000025, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000046, 0x00000001, DoBurnHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000046, 0x00000001, DoDeath, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000025, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000046, 0x00000001, DoBurnHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoDeath, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000013, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000016, 0x00000001, 0x00000021, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000046, 0x00000001, DoDeath, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoDeath, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoShockHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoJumpBack, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000005, 0x00000000, 0x00000001, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300007, 0x00000046, 0x00000001, DoReturnHome, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A80E7, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000005, 0x00000000, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000026, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoShockHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000013, 0x00000016, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C80, 0x00000011, 0x00000002, 0xFE363C80, 0x0035D000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300018, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetStatusFlags, 0xFFFFFF81, 0xFE363C83, 0x00000010, 0x00000002, 0xFE363C83, 0x00080000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF8, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001A, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x0000001D, 0x00000001, 0x0000001F, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300003, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C81, 0x00300002, 0x00000013, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000046, 0x00000001, DoImmune, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000020, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000046, 0x00000001, DoNormalHit, 0x00000008, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300009, 0x00000046, 0x00000001, DoDeath, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoNormalHit, 0x00000008, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000046, 0x00000001, DoDeath, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000031, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300002, 0x00000046, 0x00000001, DoRecover, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000039, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300003, 0x00000046, 0x00000001, DoImmune, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300007, 0x00000025, 0x00000002, 0xFE363C82, 0x00300008, 0x00000046, 0x00000001, DoScareAway, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000003A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x0030000F, 0x00000046, 0x00000001, DoAirLift, 0x00000016, 0x00000001, 0x00000016, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x0030000F, 0x00000012, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00300008, 0x00000013, 0x00000000, 0x00000046, 0x00000001, DoBlowAway, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802197AC_4D199C -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimationRate, 0xFFFFFF81, 0x00000001, 0xF24A8680, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimationRate, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300005, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000010, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300003, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000006, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, b_area_iwa_StartRumbleWithParams, 0x000000C8, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300002, 0x00000043, 0x00000004, SetIdleAnimations, 0xFFFFFF81, 0x00000001, D_80218838_4D0A28, 0x00000043, 0x00000004, SetDefenseTable, 0xFFFFFF81, 0x00000001, D_80218710_4D0900, 0x00000043, 0x00000005, SetTargetOffset, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000016, 0x00000043, 0x00000005, func_8027D4C8, 0xFFFFFF81, 0x00000001, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPartEventBits, 0xFFFFFF81, 0x00000001, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80218000_4D01F0, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00000400, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimationRate, 0xFFFFFF81, 0x00000001, 0xF24A8680, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetAnimationRate, 0xFFFFFF81, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300005, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000001, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000010, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300003, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000006, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7FB4, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, b_area_iwa_StartRumbleWithParams, 0x000000C8, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000001, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetActorRotationOffset, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorRotation, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000004, SetActorVar, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300002, 0x00000043, 0x00000004, SetIdleAnimations, 0xFFFFFF81, 0x00000001, D_80218838_4D0A28, 0x00000043, 0x00000004, SetDefenseTable, 0xFFFFFF81, 0x00000001, D_80218710_4D0900, 0x00000043, 0x00000005, SetTargetOffset, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000016, 0x00000043, 0x00000005, func_8027D4C8, 0xFFFFFF81, 0x00000001, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPartEventBits, 0xFFFFFF81, 0x00000001, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, b_area_iwa_SetSpinSmashable, 0x00000001, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00000400, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80219BA0_4D1D90 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000004, func_8024ECF8, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000043, 0x00000002, MoveBattleCamOver, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000020, 0x00000004, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000020, 0x00000004, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x0000001D, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000020, 0x00000004, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300010, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300011, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000032, 0x00000000, 0xFFFFFFFB, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8A80, 0x00000043, 0x00000004, RunToGoal, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000020D1, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000010, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300011, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, RunToGoal, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x0000002D, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300008, 0x00000008, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000001, YieldTurn, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x000000B4, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300007, 0x00000043, 0x00000002, SetGoalToHome, 0xFFFFFF81, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, RunToGoal, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300002, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetActorYaw, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300011, 0x00000043, 0x00000005, GetActorPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, RunToGoal, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000020, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300002, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A841A, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x00000006, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, YieldTurn, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300007, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000002, SetGoalToHome, 0xFFFFFF81, 0x00000043, 0x00000004, RunToGoal, 0xFFFFFF81, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00300002, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/area_jan/573EE0.data.s b/ver/us/asm/data/battle/area_jan/573EE0.data.s index 2bc97aa23c..85c804f561 100644 --- a/ver/us/asm/data/battle/area_jan/573EE0.data.s +++ b/ver/us/asm/data/battle/area_jan/573EE0.data.s @@ -243,7 +243,7 @@ glabel D_80222920_57E240 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0xFFFFFF81, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoNormalHit, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400008, 0x00000025, 0x00000002, 0xFE363C82, 0x00400009, 0x00000046, 0x00000001, DoBurnHit, 0x00000016, 0x00000001, 0x00000024, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400008, 0x00000025, 0x00000002, 0xFE363C82, 0x00400009, 0x00000046, 0x00000001, DoBurnHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400009, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000000B, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000016, 0x00000001, 0x00000021, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoShockHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoJumpBack, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8A80, 0x00000046, 0x00000001, D_8022285C_57E17C, 0x00000016, 0x00000001, 0x00000026, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoShockHit, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x0000001D, 0x00000001, 0x0000001F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400001, 0x00000046, 0x00000001, DoImmune, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000020, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoNormalHit, 0x00000008, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000038, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HPBarToCurrent, 0xFFFFFF81, 0x00000016, 0x00000001, 0x00000035, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_8022285C_57E17C, 0x00000043, 0x00000002, HPBarToHome, 0xFFFFFF81, 0x00000016, 0x00000001, 0x00000031, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400001, 0x00000046, 0x00000001, DoRecover, 0x00000016, 0x00000001, 0x00000039, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00000200, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400003, 0x00000025, 0x00000002, 0xFE363C82, 0x0040000B, 0x00000046, 0x00000001, DoScareAway, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000003A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoAirLift, 0x00000016, 0x00000001, 0x00000016, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoBlowAway, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80222ED0_57E7F0 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000004, func_8024ECF8, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000000F, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400003, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFFC, 0x0000000C, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8A, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, func_802183DC_573CFC, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x0000003C, 0xF24AF280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24AA280, 0x00000046, 0x00000001, D_8022285C_57E17C, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, JumpWithBounce, 0xFFFFFF81, 0x0000000A, 0xF24A8280, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_8022285C_57E17C, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000004, func_8024ECF8, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000000F, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400003, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFFC, 0x0000000C, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8A, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, b_area_jan_MediGuySpriteRotationFunc, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x0000003C, 0xF24AF280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24AA280, 0x00000046, 0x00000001, D_8022285C_57E17C, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, JumpWithBounce, 0xFFFFFF81, 0x0000000A, 0xF24A8280, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_8022285C_57E17C, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802236B8_57EFD8 .word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C80, 0x00000043, 0x00000005, GetActorPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000214, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000027, 0x00000002, 0xFE363C82, 0x00000032, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFE363C8A, 0x00000043, 0x00000003, GetEnemyMaxHP, 0xFE363C8A, 0xFE363C84, 0x00000029, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000064, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x0000206D, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x00000214, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x0000025C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8026BF48, 0x00000001, 0x00000043, 0x00000004, HealActor, 0xFE363C8A, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, func_8026BF48, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, WaitForBuffDone, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/area_omo/5137E0.data.s b/ver/us/asm/data/battle/area_omo/5137E0.data.s index 2654ccd503..3270de7e73 100644 --- a/ver/us/asm/data/battle/area_omo/5137E0.data.s +++ b/ver/us/asm/data/battle/area_omo/5137E0.data.s @@ -246,7 +246,7 @@ glabel D_802237E0_51DDB0 .word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, GetLastEvent, 0xFFFFFF81, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000009, 0x0000001D, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoNormalHit, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x0000000E, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400008, 0x00000025, 0x00000002, 0xFE363C82, 0x00400009, 0x00000046, 0x00000001, DoBurnHit, 0x00000016, 0x00000001, 0x00000024, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400008, 0x00000025, 0x00000002, 0xFE363C82, 0x00400009, 0x00000046, 0x00000001, DoBurnHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400009, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000000B, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000016, 0x00000001, 0x00000021, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoSpinSmashHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000002F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoShockHit, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoJumpBack, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8A80, 0x00000046, 0x00000001, D_8022371C_51DCEC, 0x00000016, 0x00000001, 0x00000026, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoShockHit, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x0000001D, 0x00000001, 0x00000017, 0x0000001D, 0x00000001, 0x00000019, 0x0000001D, 0x00000001, 0x0000001F, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400001, 0x00000046, 0x00000001, DoImmune, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000020, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoNormalHit, 0x00000008, 0x00000001, 0x0000000A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400007, 0x00000046, 0x00000001, DoDeath, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000038, 0x00000043, 0x00000005, SetActorPos, 0xFFFFFF81, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HPBarToCurrent, 0xFFFFFF81, 0x00000016, 0x00000001, 0x00000035, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_8022371C_51DCEC, 0x00000043, 0x00000002, HPBarToHome, 0xFFFFFF81, 0x00000016, 0x00000001, 0x00000031, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400001, 0x00000046, 0x00000001, DoRecover, 0x00000016, 0x00000001, 0x00000039, 0x00000043, 0x00000004, SetActorFlagBits, 0xFFFFFF81, 0x00000200, 0x00000000, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400003, 0x00000025, 0x00000002, 0xFE363C82, 0x0040000B, 0x00000046, 0x00000001, DoScareAway, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x0000003A, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoAirLift, 0x00000016, 0x00000001, 0x00000016, 0x00000025, 0x00000002, 0xFE363C80, 0x00000001, 0x00000025, 0x00000002, 0xFE363C81, 0x00400006, 0x00000046, 0x00000001, DoBlowAway, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80223D90_51E360 -.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000004, func_8024ECF8, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000000F, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400003, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFFC, 0x0000000C, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8A, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, func_802185AC_512B7C, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x0000003C, 0xF24AF280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24AA280, 0x00000046, 0x00000001, D_8022371C_51DCEC, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, JumpWithBounce, 0xFFFFFF81, 0x0000000A, 0xF24A8280, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_8022371C_51DCEC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, SetTargetActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000004, func_8024ECF8, 0xFFFFFFFF, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000000F, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400003, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, AddGoalPos, 0xFFFFFF81, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFFC, 0x0000000C, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000014, 0x00000001, 0xFE363C8A, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, b_area_omo_MediGuySpriteRotationFunc, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x0000003C, 0xF24AF280, 0x00000043, 0x00000006, SetPartRotation, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x00000043, 0x00000007, EnemyTestTarget, 0xFFFFFF81, 0xFE363C80, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, AddActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24AA280, 0x00000046, 0x00000001, D_8022371C_51DCEC, 0x00000043, 0x00000004, RemoveActorDecoration, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A8E80, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A81B4, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, JumpToGoal, 0xFFFFFF81, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000043, 0x00000005, SetActorSounds, 0xFFFFFF81, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F9, 0x00000043, 0x00000002, SetGoalToTarget, 0xFFFFFF81, 0x00000043, 0x00000005, GetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9A80, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000043, 0x00000005, FlyToGoal, 0xFFFFFF81, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000008, EnemyDamageTarget, 0xFFFFFF81, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000020, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x00000043, 0x00000002, ResetAllActorSounds, 0xFFFFFF81, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000005, GetActorPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, SetActorJumpGravity, 0xFFFFFF81, 0xF24A7E80, 0x00000043, 0x00000005, SetGoalPos, 0xFFFFFF81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, JumpWithBounce, 0xFFFFFF81, 0x0000000A, 0xF24A8280, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetActorSpeed, 0xFFFFFF81, 0xF24A9280, 0x00000046, 0x00000001, D_8022371C_51DCEC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80224578_51EB48 .word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFFFFFF81, 0x00000043, 0x00000002, GetOwnerID, 0xFE363C80, 0x00000043, 0x00000005, GetActorPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x000002F8, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000214, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFFFFFF81, 0x00000000, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400005, 0x00000027, 0x00000002, 0xFE363C82, 0x00000032, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetAnimation, 0xFFFFFF81, 0x00000001, 0x00400001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, UseBattleCamPreset, 0x0000003F, 0x00000043, 0x00000002, BattleCamTargetActor, 0xFE363C8A, 0x00000043, 0x00000003, GetEnemyMaxHP, 0xFE363C8A, 0xFE363C84, 0x00000029, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000064, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x0000206D, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x00000214, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlaySoundAtActor, 0xFE363C8A, 0x0000025C, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8026BF48, 0x00000001, 0x00000043, 0x00000004, HealActor, 0xFE363C8A, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, func_8026BF48, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, WaitForBuffDone, 0x00000043, 0x00000002, UseBattleCamPreset, 0x00000002, 0x00000043, 0x00000003, EnableIdleScript, 0xFFFFFF81, 0x00000001, 0x00000043, 0x00000003, UseIdleAnimation, 0xFFFFFF81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_end/end_00/DFB0B0.data.s b/ver/us/asm/data/world/area_end/end_00/DFB0B0.data.s index 6cf041586b..a375f075f2 100644 --- a/ver/us/asm/data/world/area_end/end_00/DFB0B0.data.s +++ b/ver/us/asm/data/world/area_end/end_00/DFB0B0.data.s @@ -6,7 +6,7 @@ glabel D_802446B0_DFB0B0 .word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFF3F8, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFF3F8, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80244724_DFB124 -.word 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF21A5A80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802427D8_DF91D8, 0x00000043, 0x00000005, TranslateGroup, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7D2B, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_80242830_DF9230, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C80, 0x00010000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF21A5A80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802427D8_DF91D8, 0x00000043, 0x00000005, TranslateGroup, 0x00000006, 0xFE363C81, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7D2B, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C80, 0x00010000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242898_DF9298, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80244814_DFB214 .word 0x00000043, 0x00000003, EnableTexPanning, 0x00000011, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000013, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000021, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000023, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000025, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000027, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000029, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000031, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000033, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00020000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFE0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -60,7 +60,7 @@ glabel D_80244D74_DFB774 .word 0x00D90002, 0x00000000, 0xC5340000, 0x00000000, 0x00000000, 0x43870000, 0x00DF0002, 0x00000000, 0xC5340000, 0x00000000, 0xC1A00000, 0x43870000, 0x00DF0002, 0x00000000, 0xC5340000, 0x00000000, 0x41A00000, 0x43870000, 0x00DF0003, 0x00000000, 0xC530E000, 0x00000000, 0xC1A00000, 0x43870000, 0x00DF0003, 0x00000000, 0xC530E000, 0x00000000, 0x41A00000, 0x43870000, 0x00DF0004, 0x00000000, 0xC52DC000, 0x00000000, 0xC1A00000, 0x43870000, 0x00DF0004, 0x00000000, 0xC52DC000, 0x00000000, 0x41A00000, 0x43870000, 0x00DA0000, 0x00000000, 0xC5219000, 0x428C0000, 0x41700000, 0x43870000, 0x00DA0001, 0x00000000, 0xC51D5000, 0x42200000, 0x40E00000, 0x42B40000, 0x00DA0002, 0x00000000, 0xC51E8000, 0x42480000, 0x42180000, 0x43870000, 0x00DA0003, 0x00000000, 0xC51D3000, 0x42A00000, 0x40A00000, 0x43870000, 0x00DA0004, 0x00000000, 0xC51AB000, 0x42600000, 0x00000000, 0x43870000, 0x00DA0005, 0x00000000, 0xC520F000, 0x41A00000, 0x42400000, 0x43870000, 0x00DA0006, 0x00000000, 0xC520A000, 0x42740000, 0x40E00000, 0x42B40000, 0x00DA0007, 0x00000000, 0xC524B000, 0x42200000, 0x00000000, 0x43870000, 0x00DF0005, 0x00000000, 0xC512E000, 0x00000000, 0x00000000, 0x43870000, 0x00DF0005, 0x00000000, 0xC50FC000, 0x00000000, 0x00000000, 0x43870000, 0x00DF0005, 0x00000000, 0xC50CA000, 0x00000000, 0x00000000, 0x43870000, 0x00DF0009, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00DF0009, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00DF0009, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00AF0002, 0x00000000, 0xC5048000, 0x00000000, 0x00000000, 0x43870000, 0x00850001, 0x00000000, 0xC5016000, 0x00000000, 0x00000000, 0x43870000, 0x0066011A, 0x00000000, 0xC4E88000, 0x42820000, 0x41200000, 0x43870000, 0x0066001A, 0x00000000, 0xC4E60000, 0x42820000, 0x41200000, 0x42B40000, 0x0066021A, 0x00000000, 0xC4E9C000, 0x41400000, 0x42140000, 0x43870000, 0x0066031A, 0x00000000, 0xC4E4C000, 0x41400000, 0x42140000, 0x42B40000, 0x002C0005, 0x00000000, 0xC4DAC000, 0x00000000, 0x422C0000, 0x43870000, 0x002C0005, 0x00000000, 0xC4D70000, 0x00000000, 0x422C0000, 0x43870000, 0x002C0005, 0x00000000, 0xC4D34000, 0x00000000, 0x422C0000, 0x43870000, 0x002C0005, 0x00000000, 0xC4CF8000, 0x00000000, 0x422C0000, 0x43870000, 0x00DC0001, 0x00000000, 0xC4C26000, 0x42340000, 0xC33E0000, 0x43870000, 0x00DC0004, 0x00000000, 0xC4C4E000, 0x42340000, 0xC3520000, 0x43870000, 0x00A7000A, D_80244C78_DFB678, 0xC4DDE000, 0x00000000, 0x40000000, 0x42B40000, 0x00A7000A, D_80244C78_DFB678, 0xC4D98000, 0x00000000, 0x40000000, 0x42B40000, 0x00BD0004, D_80244C94_DFB694, 0xC49B0000, 0x00000000, 0xC0000000, 0x43870000, 0x00940004, D_80244CAC_DFB6AC, 0xC4974000, 0x00000000, 0xC0000000, 0x43870000, 0x00940004, D_80244CAC_DFB6AC, 0xC4938000, 0x00000000, 0xC0000000, 0x43870000, 0x00680002, D_80244C60_DFB660, 0xC4820000, 0x00000000, 0x41F00000, 0x43870000, 0x00690003, 0x00000000, 0xC47A0000, 0x00000000, 0x41F00000, 0x43870000, 0x00670005, D_80244CBC_DFB6BC, 0xC455C000, 0x428C0000, 0xC30C0000, 0x43870000, 0x00DD0002, 0x00000000, 0xC45AC000, 0x428C0000, 0xC3250000, 0x43870000, 0x00DD0002, 0x00000000, 0xC455C000, 0x428C0000, 0xC3200000, 0x42B40000, 0x00DD0002, 0x00000000, 0xC450C000, 0x428C0000, 0xC3250000, 0x42B40000, 0x00BF0001, 0x00000000, 0xC4228000, 0x41A00000, 0x00000000, 0x43870000, 0x00680002, D_80244C60_DFB660, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00690003, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00690003, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00690003, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00E40000, 0x00000000, 0xC39B0000, 0x420C0000, 0x00000000, 0x43870000, 0x0095000D, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x0095000D, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x0095000D, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x006C0001, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00630000, D_80244CC8_DFB6C8, 0xC28C0000, 0x43020000, 0xC2700000, 0x43870000, 0x00620004, 0x00000000, 0xC2DC0000, 0x00000000, 0xC1E00000, 0x42B40000, 0x00620104, 0x00000000, 0xC1F00000, 0x00000000, 0xC2000000, 0x43870000, 0x00DB0005, 0x00000000, 0x43540000, 0x42200000, 0x420C0000, 0x43870000, 0x00DB0006, 0x00000000, 0x43770000, 0x42200000, 0x420C0000, 0x43870000, 0x00DB0007, 0x00000000, 0x438D0000, 0x42200000, 0x420C0000, 0x42B40000, 0x00DB0008, 0x00000000, 0x43880000, 0x42480000, 0x41C80000, 0x42B40000, 0x00DB0009, 0x00000000, 0x43680000, 0x42480000, 0x41C80000, 0x43870000, 0x00C40003, D_80244CD8_DFB6D8, 0x43B28000, 0xC2F00000, 0xC1F00000, 0x42B40000, 0x00790004, D_80244CE0_DFB6E0, 0x43FD8000, 0x42480000, 0xC0A00000, 0x42B40000, 0x00970002, 0x00000000, 0x440E8000, 0x42480000, 0x00000000, 0x42B40000, 0x00970103, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00970203, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00970303, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x00970403, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x007C0001, D_80244CE8_DFB6E8, 0x44848000, 0x42A00000, 0x00000000, 0x43870000, 0x007C0002, D_80244CE8_DFB6E8, 0x44848000, 0x42A00000, 0x00000000, 0x43870000, 0x007C0003, D_80244CE8_DFB6E8, 0x44848000, 0x42A00000, 0x00000000, 0x43870000, 0x007D0001, D_80244D10_DFB710, 0x44750000, 0x42700000, 0x00000000, 0x43870000, 0x007D0001, D_80244D10_DFB710, 0x448E8000, 0x42700000, 0x00000000, 0x43870000, 0x00C10002, D_80244D20_DFB720, 0x449EC000, 0x00000000, 0xC1A00000, 0x43870000, 0x004E000A, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x004E000A, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x42B40000, 0x007F000E, 0x00000000, 0x44B40000, 0x00000000, 0x00000000, 0x43870000, 0x007F000E, 0x00000000, 0x44C80000, 0x00000000, 0x00000000, 0x43870000, 0x007F000A, 0x00000000, 0x44FA0000, 0x42C80000, 0x00000000, 0x43870000, 0x007F000B, 0x00000000, 0x45002000, 0x42C80000, 0x00000000, 0x43870000, 0x007F000C, 0x00000000, 0x45034000, 0x42C80000, 0x00000000, 0x43870000, 0x00600014, D_80244D58_DFB758, 0x45070000, 0x42700000, 0x00000000, 0x43870000, 0x00240006, D_80244D40_DFB740, 0x4500C000, 0x00000000, 0x00000000, 0x42B40000, 0x00D70000, 0x00000000, 0x45156000, 0x41200000, 0x00000000, 0x43870000, 0x00D70001, 0x00000000, 0x45156000, 0x41200000, 0x00000000, 0x43870000, 0x00D70002, 0x00000000, 0x450FC000, 0x00000000, 0x00000000, 0x43870000, 0x00D70002, 0x00000000, 0x450D4000, 0x00000000, 0x00000000, 0x43870000, 0x00D70003, 0x00000000, 0x451B0000, 0x00000000, 0x00000000, 0x43870000, 0x00D70003, 0x00000000, 0x451D8000, 0x00000000, 0x00000000, 0x43870000, 0x00D80000, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000, 0x00D80002, 0x00000000, 0x00000000, 0xC3FA0000, 0x00000000, 0x43870000 glabel D_80245614_DFC014 -.word 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000000, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00025000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000002, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000003, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000004, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000005, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000006, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF4E3, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000000, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000007, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000008, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000009, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000E, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF60A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000001, 0x00000043, 0x00000002, DeleteNpc, 0x00000002, 0x00000043, 0x00000002, DeleteNpc, 0x00000003, 0x00000043, 0x00000002, DeleteNpc, 0x00000004, 0x00000043, 0x00000002, DeleteNpc, 0x00000005, 0x00000043, 0x00000002, DeleteNpc, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00025000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000010, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000011, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000012, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000013, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000014, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF704, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000007, 0x00000043, 0x00000002, DeleteNpc, 0x00000008, 0x00000043, 0x00000002, DeleteNpc, 0x00000009, 0x00000043, 0x00000002, DeleteNpc, 0x0000000A, 0x00000043, 0x00000002, DeleteNpc, 0x0000000B, 0x00000043, 0x00000002, DeleteNpc, 0x0000000C, 0x00000043, 0x00000002, DeleteNpc, 0x0000000D, 0x00000043, 0x00000002, DeleteNpc, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000015, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000016, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7EA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000000F, 0x00000043, 0x00000002, DeleteNpc, 0x00000010, 0x00000043, 0x00000002, DeleteNpc, 0x00000011, 0x00000043, 0x00000002, DeleteNpc, 0x00000012, 0x00000043, 0x00000002, DeleteNpc, 0x00000013, 0x00000043, 0x00000002, DeleteNpc, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000B000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000017, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000018, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000019, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001E, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF89E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000015, 0x00000043, 0x00000002, DeleteNpc, 0x00000016, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000020, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFA24, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000017, 0x00000043, 0x00000002, DeleteNpc, 0x00000018, 0x00000043, 0x00000002, DeleteNpc, 0x00000019, 0x00000043, 0x00000002, DeleteNpc, 0x0000001A, 0x00000043, 0x00000002, DeleteNpc, 0x0000001B, 0x00000043, 0x00000002, DeleteNpc, 0x0000001C, 0x00000043, 0x00000002, DeleteNpc, 0x0000001D, 0x00000043, 0x00000002, DeleteNpc, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00019F00, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000026, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000021, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000022, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000023, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000024, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000025, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000027, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00007000, 0xFE363C8F, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFB64, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000001F, 0x00000043, 0x00000002, DeleteNpc, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000028, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000029, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFC40, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000026, 0x00000043, 0x00000002, DeleteNpc, 0x00000021, 0x00000043, 0x00000002, DeleteNpc, 0x00000022, 0x00000043, 0x00000002, DeleteNpc, 0x00000023, 0x00000043, 0x00000002, DeleteNpc, 0x00000024, 0x00000043, 0x00000002, DeleteNpc, 0x00000025, 0x00000043, 0x00000002, DeleteNpc, 0x00000027, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00011F00, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000030, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002C, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000A000, 0xFE363C8F, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFDE4, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000028, 0x00000043, 0x00000002, DeleteNpc, 0x00000029, 0x00000043, 0x00000002, DeleteNpc, 0x0000002A, 0x00000043, 0x00000002, DeleteNpc, 0x0000002B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000035, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000032, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000033, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000034, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000031, 0x00000043, 0x00000003, func_80242830_DF9230, 0x00000031, 0xF24A8A80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000031, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFECA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000002C, 0x00000043, 0x00000002, DeleteNpc, 0x0000002D, 0x00000043, 0x00000002, DeleteNpc, 0x0000002E, 0x00000043, 0x00000002, DeleteNpc, 0x0000002F, 0x00000043, 0x00000002, DeleteNpc, 0x00000030, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000F000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000036, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000037, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000038, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000043, 0x00000003, func_80242830_DF9230, 0x00000036, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000036, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFFCB, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000031, 0x00000043, 0x00000002, DeleteNpc, 0x00000032, 0x00000043, 0x00000002, DeleteNpc, 0x00000033, 0x00000043, 0x00000002, DeleteNpc, 0x00000034, 0x00000043, 0x00000002, DeleteNpc, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000039, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003D, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002EE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000036, 0x00000043, 0x00000002, DeleteNpc, 0x00000037, 0x00000043, 0x00000002, DeleteNpc, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00020000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000040, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000041, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000042, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000043, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000044, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000320, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000039, 0x00000043, 0x00000002, DeleteNpc, 0x0000003A, 0x00000043, 0x00000002, DeleteNpc, 0x0000003B, 0x00000043, 0x00000002, DeleteNpc, 0x0000003C, 0x00000043, 0x00000002, DeleteNpc, 0x0000003D, 0x00000043, 0x00000002, DeleteNpc, 0x0000003E, 0x00000043, 0x00000002, DeleteNpc, 0x0000003F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000045, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000046, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000047, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000048, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000049, 0x00000043, 0x00000003, func_80242830_DF9230, 0x00000045, 0xF24A9280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000045, 0x00010000, 0x00000001, 0x00000043, 0x00000003, func_80242830_DF9230, 0x0000004A, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004A, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000004B0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000040, 0x00000043, 0x00000002, DeleteNpc, 0x00000041, 0x00000043, 0x00000002, DeleteNpc, 0x00000042, 0x00000043, 0x00000002, DeleteNpc, 0x00000043, 0x00000043, 0x00000002, DeleteNpc, 0x00000044, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00002000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000050, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000051, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000043, 0x00000003, func_80242830_DF9230, 0x0000004D, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004D, 0x00010000, 0x00000001, 0x00000043, 0x00000003, func_80242830_DF9230, 0x0000004E, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004E, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000546, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000045, 0x00000043, 0x00000002, DeleteNpc, 0x00000046, 0x00000043, 0x00000002, DeleteNpc, 0x00000047, 0x00000043, 0x00000002, DeleteNpc, 0x0000004A, 0x00000043, 0x00000002, DeleteNpc, 0x00000048, 0x00000043, 0x00000002, DeleteNpc, 0x00000049, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000744, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000004D, 0x00000043, 0x00000002, DeleteNpc, 0x0000004E, 0x00000043, 0x00000002, DeleteNpc, 0x0000004F, 0x00000043, 0x00000002, DeleteNpc, 0x00000050, 0x00000043, 0x00000002, DeleteNpc, 0x00000051, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000053, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000052, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000007A8, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000004B, 0x00000043, 0x00000002, DeleteNpc, 0x0000004C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000054, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000055, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000056, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000057, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000058, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000059, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000005A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000005B, 0x00000043, 0x00000003, func_80242830_DF9230, 0x00000054, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000054, 0x00010000, 0x00000001, 0x00000043, 0x00000003, func_80242830_DF9230, 0x0000005A, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000005A, 0x00010000, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000005B, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000000, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00025000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000002, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000003, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000004, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000005, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000006, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF4E3, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000000, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000007, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000008, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000009, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000E, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF60A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000001, 0x00000043, 0x00000002, DeleteNpc, 0x00000002, 0x00000043, 0x00000002, DeleteNpc, 0x00000003, 0x00000043, 0x00000002, DeleteNpc, 0x00000004, 0x00000043, 0x00000002, DeleteNpc, 0x00000005, 0x00000043, 0x00000002, DeleteNpc, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00025000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000000F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000010, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000011, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000012, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000013, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000014, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF704, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000007, 0x00000043, 0x00000002, DeleteNpc, 0x00000008, 0x00000043, 0x00000002, DeleteNpc, 0x00000009, 0x00000043, 0x00000002, DeleteNpc, 0x0000000A, 0x00000043, 0x00000002, DeleteNpc, 0x0000000B, 0x00000043, 0x00000002, DeleteNpc, 0x0000000C, 0x00000043, 0x00000002, DeleteNpc, 0x0000000D, 0x00000043, 0x00000002, DeleteNpc, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000015, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000016, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7EA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000000F, 0x00000043, 0x00000002, DeleteNpc, 0x00000010, 0x00000043, 0x00000002, DeleteNpc, 0x00000011, 0x00000043, 0x00000002, DeleteNpc, 0x00000012, 0x00000043, 0x00000002, DeleteNpc, 0x00000013, 0x00000043, 0x00000002, DeleteNpc, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000B000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000017, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000018, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000019, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001E, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF89E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000015, 0x00000043, 0x00000002, DeleteNpc, 0x00000016, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000001F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000020, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFA24, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000017, 0x00000043, 0x00000002, DeleteNpc, 0x00000018, 0x00000043, 0x00000002, DeleteNpc, 0x00000019, 0x00000043, 0x00000002, DeleteNpc, 0x0000001A, 0x00000043, 0x00000002, DeleteNpc, 0x0000001B, 0x00000043, 0x00000002, DeleteNpc, 0x0000001C, 0x00000043, 0x00000002, DeleteNpc, 0x0000001D, 0x00000043, 0x00000002, DeleteNpc, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00019F00, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000026, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000021, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000022, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000023, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000024, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000025, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000027, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00007000, 0xFE363C8F, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFB64, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000001F, 0x00000043, 0x00000002, DeleteNpc, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000028, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000029, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002B, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFC40, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000026, 0x00000043, 0x00000002, DeleteNpc, 0x00000021, 0x00000043, 0x00000002, DeleteNpc, 0x00000022, 0x00000043, 0x00000002, DeleteNpc, 0x00000023, 0x00000043, 0x00000002, DeleteNpc, 0x00000024, 0x00000043, 0x00000002, DeleteNpc, 0x00000025, 0x00000043, 0x00000002, DeleteNpc, 0x00000027, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00011F00, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000030, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000002C, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000A000, 0xFE363C8F, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFDE4, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000028, 0x00000043, 0x00000002, DeleteNpc, 0x00000029, 0x00000043, 0x00000002, DeleteNpc, 0x0000002A, 0x00000043, 0x00000002, DeleteNpc, 0x0000002B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000035, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000032, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000033, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000034, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000031, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x00000031, 0xF24A8A80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000031, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFECA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000002C, 0x00000043, 0x00000002, DeleteNpc, 0x0000002D, 0x00000043, 0x00000002, DeleteNpc, 0x0000002E, 0x00000043, 0x00000002, DeleteNpc, 0x0000002F, 0x00000043, 0x00000002, DeleteNpc, 0x00000030, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x0000F000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000036, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000037, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000038, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x00000036, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000036, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFFCB, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000031, 0x00000043, 0x00000002, DeleteNpc, 0x00000032, 0x00000043, 0x00000002, DeleteNpc, 0x00000033, 0x00000043, 0x00000002, DeleteNpc, 0x00000034, 0x00000043, 0x00000002, DeleteNpc, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000039, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003C, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000003D, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002EE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000036, 0x00000043, 0x00000002, DeleteNpc, 0x00000037, 0x00000043, 0x00000002, DeleteNpc, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00020000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000040, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000041, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000042, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000043, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000044, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000320, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000039, 0x00000043, 0x00000002, DeleteNpc, 0x0000003A, 0x00000043, 0x00000002, DeleteNpc, 0x0000003B, 0x00000043, 0x00000002, DeleteNpc, 0x0000003C, 0x00000043, 0x00000002, DeleteNpc, 0x0000003D, 0x00000043, 0x00000002, DeleteNpc, 0x0000003E, 0x00000043, 0x00000002, DeleteNpc, 0x0000003F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000045, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000046, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000047, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000048, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000049, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x00000045, 0xF24A9280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000045, 0x00010000, 0x00000001, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x0000004A, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004A, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000004B0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000040, 0x00000043, 0x00000002, DeleteNpc, 0x00000041, 0x00000043, 0x00000002, DeleteNpc, 0x00000042, 0x00000043, 0x00000002, DeleteNpc, 0x00000043, 0x00000043, 0x00000002, DeleteNpc, 0x00000044, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_80242744_DF9144, 0x00002000, 0xFE363C80, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004D, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004E, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004F, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000050, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000051, 0x00000043, 0x00000002, func_802427A4_DF91A4, 0xFE363C80, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x0000004D, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004D, 0x00010000, 0x00000001, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x0000004E, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000004E, 0x00010000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000546, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x00000045, 0x00000043, 0x00000002, DeleteNpc, 0x00000046, 0x00000043, 0x00000002, DeleteNpc, 0x00000047, 0x00000043, 0x00000002, DeleteNpc, 0x0000004A, 0x00000043, 0x00000002, DeleteNpc, 0x00000048, 0x00000043, 0x00000002, DeleteNpc, 0x00000049, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004B, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000004C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000744, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000004D, 0x00000043, 0x00000002, DeleteNpc, 0x0000004E, 0x00000043, 0x00000002, DeleteNpc, 0x0000004F, 0x00000043, 0x00000002, DeleteNpc, 0x00000050, 0x00000043, 0x00000002, DeleteNpc, 0x00000051, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000053, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000052, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000007A8, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DeleteNpc, 0x0000004B, 0x00000043, 0x00000002, DeleteNpc, 0x0000004C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000054, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000055, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000056, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000057, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000058, 0x00000043, 0x00000002, func_80242680_DF9080, 0x00000059, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000005A, 0x00000043, 0x00000002, func_80242680_DF9080, 0x0000005B, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x00000054, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000054, 0x00010000, 0x00000001, 0x00000043, 0x00000003, end_00_SetNpcShadowScale, 0x0000005A, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000005A, 0x00010000, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000005B, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80246ADC_DFD4DC .word 0x00000008, 0x00000001, 0x000000F0, 0x00000044, 0x00000001, 0x8024462C, 0x00000044, 0x00000001, 0x80244688, 0x00000044, 0x00000001, 0x80244648, 0x00000044, 0x00000001, 0x80244668, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80244AE4_DFB4E4, 0x00000044, 0x00000001, D_80244B64_DFB564, 0x00000044, 0x00000001, D_802446B0_DFB0B0, 0x00000044, 0x00000001, D_80245614_DFC014, 0x00000045, 0x00000002, D_80247230_DFDC30, 0xFE363C8A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000055, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80246ADC_DFD4DC, 0x00000044, 0x00000001, D_80244724_DFB124, 0x00000044, 0x00000001, D_80244814_DFB214, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF4E3, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80247418_DFDE18, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF60A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_802479C4_DFE3C4, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF79A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80248928, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFF7D6, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80248BAC, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFA24, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80249040, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFAB5, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80249A38, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFD08, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80249EA4, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFC40, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024A044, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFECA, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024A804, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFFCB, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024AD30, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000002EE, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024C38C, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x000004B0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024CC78, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000744, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x8024D834, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000A14, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x8024E958, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/196AA0/CloseActionCommandInfo.s b/ver/us/asm/nonmatchings/196AA0/CloseActionCommandInfo.s index 7d2af9f4fc..e89728e76a 100644 --- a/ver/us/asm/nonmatchings/196AA0/CloseActionCommandInfo.s +++ b/ver/us/asm/nonmatchings/196AA0/CloseActionCommandInfo.s @@ -5,8 +5,8 @@ glabel CloseActionCommandInfo /* 197CF0 80269410 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 197CF4 80269414 10A0000D */ beqz $a1, .L8026944C /* 197CF8 80269418 AFBF0010 */ sw $ra, 0x10($sp) -/* 197CFC 8026941C 3C02802A */ lui $v0, %hi(D_8029FBE0) -/* 197D00 80269420 2442FBE0 */ addiu $v0, $v0, %lo(D_8029FBE0) +/* 197CFC 8026941C 3C02802A */ lui $v0, %hi(gActionCommandStatus) +/* 197D00 80269420 2442FBE0 */ addiu $v0, $v0, %lo(gActionCommandStatus) /* 197D04 80269424 8443004A */ lh $v1, 0x4a($v0) /* 197D08 80269428 28620007 */ slti $v0, $v1, 7 /* 197D0C 8026942C 10400003 */ beqz $v0, .L8026943C diff --git a/ver/us/asm/nonmatchings/196AA0/GetCommandAutoSuccess.s b/ver/us/asm/nonmatchings/196AA0/GetCommandAutoSuccess.s index b04121a9f7..cea2c04683 100644 --- a/ver/us/asm/nonmatchings/196AA0/GetCommandAutoSuccess.s +++ b/ver/us/asm/nonmatchings/196AA0/GetCommandAutoSuccess.s @@ -7,8 +7,8 @@ glabel GetCommandAutoSuccess /* 197C84 802693A4 AFB10014 */ sw $s1, 0x14($sp) /* 197C88 802693A8 AFB00010 */ sw $s0, 0x10($sp) /* 197C8C 802693AC 8C82000C */ lw $v0, 0xc($a0) -/* 197C90 802693B0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 197C94 802693B4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 197C90 802693B0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 197C94 802693B4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 197C98 802693B8 8C450000 */ lw $a1, ($v0) /* 197C9C 802693BC 0C0B1EAF */ jal get_variable /* 197CA0 802693C0 0220802D */ daddu $s0, $s1, $zero diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268284.s b/ver/us/asm/nonmatchings/196AA0/func_80268284.s index 2489ba6fdc..41a6f9a598 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80268284.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80268284.s @@ -3,8 +3,8 @@ glabel func_80268284 /* 196B64 80268284 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 196B68 80268288 3C0B802A */ lui $t3, %hi(D_8029FBE0) -/* 196B6C 8026828C 256BFBE0 */ addiu $t3, $t3, %lo(D_8029FBE0) +/* 196B68 80268288 3C0B802A */ lui $t3, %hi(gActionCommandStatus) +/* 196B6C 8026828C 256BFBE0 */ addiu $t3, $t3, %lo(gActionCommandStatus) /* 196B70 80268290 AFBF0064 */ sw $ra, 0x64($sp) /* 196B74 80268294 AFBE0060 */ sw $fp, 0x60($sp) /* 196B78 80268298 AFB7005C */ sw $s7, 0x5c($sp) diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268938.s b/ver/us/asm/nonmatchings/196AA0/func_80268938.s index bb1d501d9c..4179915463 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80268938.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80268938.s @@ -18,8 +18,8 @@ glabel func_80268938 /* 197230 80268950 0C09A327 */ jal func_80268C9C /* 197234 80268954 00000000 */ nop .L80268958: -/* 197238 80268958 3C02802A */ lui $v0, %hi(D_8029FBE0) -/* 19723C 8026895C 2442FBE0 */ addiu $v0, $v0, %lo(D_8029FBE0) +/* 197238 80268958 3C02802A */ lui $v0, %hi(gActionCommandStatus) +/* 19723C 8026895C 2442FBE0 */ addiu $v0, $v0, %lo(gActionCommandStatus) /* 197240 80268960 8443004A */ lh $v1, 0x4a($v0) /* 197244 80268964 2C620018 */ sltiu $v0, $v1, 0x18 /* 197248 80268968 10400060 */ beqz $v0, L80268AEC_1973CC diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s b/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s index 962ef82330..8efd30b023 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s @@ -27,7 +27,7 @@ glabel L80268B28_197408 /* 197410 80268B30 0809A324 */ j L80268C90_197570 /* 197414 80268B34 00000000 */ nop glabel L80268B38_197418 -/* 197418 80268B38 0C0AA675 */ jal func_802A99D4_4229D4 +/* 197418 80268B38 0C0AA675 */ jal action_command_hammer_DrawHudElements /* 19741C 80268B3C 00000000 */ nop /* 197420 80268B40 0809A324 */ j L80268C90_197570 /* 197424 80268B44 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s b/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s index 3d3f57c729..391c595c12 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s @@ -11,8 +11,8 @@ glabel jtbl_8029D760 glabel func_80268C9C /* 19757C 80268C9C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 197580 80268CA0 AFB00010 */ sw $s0, 0x10($sp) -/* 197584 80268CA4 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 197588 80268CA8 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 197584 80268CA4 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 197588 80268CA8 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 19758C 80268CAC AFBF0014 */ sw $ra, 0x14($sp) /* 197590 80268CB0 8603004A */ lh $v1, 0x4a($s0) /* 197594 80268CB4 2C620018 */ sltiu $v0, $v1, 0x18 @@ -29,7 +29,7 @@ glabel L80268CD4_1975B4 /* 1975BC 80268CDC 0809A390 */ j .L80268E40 /* 1975C0 80268CE0 3C05FFFF */ lui $a1, 0xffff glabel L80268CE4_1975C4 -/* 1975C4 80268CE4 0C0AA68C */ jal func_802A9A30_422A30 +/* 1975C4 80268CE4 0C0AA68C */ jal action_command_hammer_FreeHudElements /* 1975C8 80268CE8 00000000 */ nop /* 1975CC 80268CEC 0809A390 */ j .L80268E40 /* 1975D0 80268CF0 3C05FFFF */ lui $a1, 0xffff diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268E88.s b/ver/us/asm/nonmatchings/196AA0/func_80268E88.s index dd99c4ce0e..83cda466dc 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80268E88.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80268E88.s @@ -4,8 +4,8 @@ glabel func_80268E88 /* 197768 80268E88 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 19776C 80268E8C AFB00010 */ sw $s0, 0x10($sp) -/* 197770 80268E90 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 197774 80268E94 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 197770 80268E90 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 197774 80268E94 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 197778 80268E98 3C048027 */ lui $a0, %hi(func_80268938) /* 19777C 80268E9C 24848938 */ addiu $a0, $a0, %lo(func_80268938) /* 197780 80268EA0 3C058027 */ lui $a1, %hi(func_80268AF8) diff --git a/ver/us/asm/nonmatchings/196AA0/func_80269118.s b/ver/us/asm/nonmatchings/196AA0/func_80269118.s index a93a6c37f8..b0c7e51c33 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80269118.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80269118.s @@ -4,8 +4,8 @@ glabel func_80269118 /* 1979F8 80269118 3C058011 */ lui $a1, %hi(gPlayerData) /* 1979FC 8026911C 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 197A00 80269120 3C04802A */ lui $a0, %hi(D_8029FBE0) -/* 197A04 80269124 2484FBE0 */ addiu $a0, $a0, %lo(D_8029FBE0) +/* 197A00 80269120 3C04802A */ lui $a0, %hi(gActionCommandStatus) +/* 197A04 80269124 2484FBE0 */ addiu $a0, $a0, %lo(gActionCommandStatus) /* 197A08 80269128 8082005E */ lb $v0, 0x5e($a0) /* 197A0C 8026912C 1440000A */ bnez $v0, .L80269158 /* 197A10 80269130 0080302D */ daddu $a2, $a0, $zero diff --git a/ver/us/asm/nonmatchings/196AA0/func_80269160.s b/ver/us/asm/nonmatchings/196AA0/func_80269160.s index b6b760d543..b24ed591ea 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80269160.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80269160.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80269160 -/* 197A40 80269160 3C03802A */ lui $v1, %hi(D_8029FBE0) -/* 197A44 80269164 2463FBE0 */ addiu $v1, $v1, %lo(D_8029FBE0) +/* 197A40 80269160 3C03802A */ lui $v1, %hi(gActionCommandStatus) +/* 197A44 80269164 2463FBE0 */ addiu $v1, $v1, %lo(gActionCommandStatus) /* 197A48 80269168 8062005E */ lb $v0, 0x5e($v1) /* 197A4C 8026916C 3C048011 */ lui $a0, %hi(gPlayerData) /* 197A50 80269170 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) diff --git a/ver/us/asm/nonmatchings/196AA0/func_802694A4.s b/ver/us/asm/nonmatchings/196AA0/func_802694A4.s index 20cbdc9993..c64d3814e3 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_802694A4.s +++ b/ver/us/asm/nonmatchings/196AA0/func_802694A4.s @@ -7,8 +7,8 @@ glabel func_802694A4 /* 197D8C 802694AC AFB10014 */ sw $s1, 0x14($sp) /* 197D90 802694B0 AFB00010 */ sw $s0, 0x10($sp) /* 197D94 802694B4 8C82000C */ lw $v0, 0xc($a0) -/* 197D98 802694B8 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 197D9C 802694BC 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 197D98 802694B8 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 197D9C 802694BC 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 197DA0 802694C0 8C450000 */ lw $a1, ($v0) /* 197DA4 802694C4 0C0B1EAF */ jal get_variable /* 197DA8 802694C8 0200882D */ daddu $s1, $s0, $zero diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9000_425B50.s b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9000_425B50.s index 5e05c9613d..e8fb5ac1e7 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9000_425B50.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9000_425B50.s @@ -14,8 +14,8 @@ glabel func_802A9000_425B50 /* 425B74 802A9024 A2420082 */ sb $v0, 0x82($s2) /* 425B78 802A9028 3C028029 */ lui $v0, %hi(D_80294280) /* 425B7C 802A902C 24424280 */ addiu $v0, $v0, %lo(D_80294280) -/* 425B80 802A9030 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 425B84 802A9034 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 425B80 802A9030 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 425B84 802A9034 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 425B88 802A9038 AE420434 */ sw $v0, 0x434($s2) /* 425B8C 802A903C 24020007 */ addiu $v0, $zero, 7 /* 425B90 802A9040 A200005E */ sb $zero, 0x5e($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A916C_425CBC.s b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A916C_425CBC.s index e8dda30967..b9ec8d9cc2 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A916C_425CBC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A916C_425CBC.s @@ -9,8 +9,8 @@ glabel func_802A916C_425CBC /* 425CCC 802A917C AFB10014 */ sw $s1, 0x14($sp) /* 425CD0 802A9180 AFB00010 */ sw $s0, 0x10($sp) /* 425CD4 802A9184 8E50000C */ lw $s0, 0xc($s2) -/* 425CD8 802A9188 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 425CDC 802A918C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 425CD8 802A9188 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 425CDC 802A918C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 425CE0 802A9190 A220005E */ sb $zero, 0x5e($s1) /* 425CE4 802A9194 8E050000 */ lw $a1, ($s0) /* 425CE8 802A9198 0C0B1EAF */ jal get_variable diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s index 464a2f4c80..1062067fb6 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9228_425D78.s @@ -4,8 +4,8 @@ glabel func_802A9228_425D78 /* 425D78 802A9228 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 425D7C 802A922C AFB10014 */ sw $s1, 0x14($sp) -/* 425D80 802A9230 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 425D84 802A9234 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 425D80 802A9230 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 425D84 802A9234 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 425D88 802A9238 AFBF0018 */ sw $ra, 0x18($sp) /* 425D8C 802A923C AFB00010 */ sw $s0, 0x10($sp) /* 425D90 802A9240 8623004C */ lh $v1, 0x4c($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A94D8_426028.s b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A94D8_426028.s index 6c1ad6ddef..4c599e1095 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A94D8_426028.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A94D8_426028.s @@ -4,8 +4,8 @@ glabel func_802A94D8_426028 /* 426028 802A94D8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 42602C 802A94DC AFB1001C */ sw $s1, 0x1c($sp) -/* 426030 802A94E0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 426034 802A94E4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 426030 802A94E0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 426034 802A94E4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 426038 802A94E8 AFBF0020 */ sw $ra, 0x20($sp) /* 42603C 802A94EC AFB00018 */ sw $s0, 0x18($sp) /* 426040 802A94F0 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9000_4273B0.s b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9000_4273B0.s index 6fb5241760..e3baa97306 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9000_4273B0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9000_4273B0.s @@ -14,8 +14,8 @@ glabel func_802A9000_4273B0 /* 4273D4 802A9024 244242E0 */ addiu $v0, $v0, %lo(D_802942E0) /* 4273D8 802A9028 AE020434 */ sw $v0, 0x434($s0) /* 4273DC 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 4273E0 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4273E4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4273E0 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4273E4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4273E8 802A9038 A2020086 */ sb $v0, 0x86($s0) /* 4273EC 802A903C 82020083 */ lb $v0, 0x83($s0) /* 4273F0 802A9040 10400044 */ beqz $v0, .L802A9154 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9170_427520.s b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9170_427520.s index 949fea215e..25f6fd4991 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9170_427520.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9170_427520.s @@ -6,8 +6,8 @@ glabel func_802A9170_427520 /* 427524 802A9174 AFB3001C */ sw $s3, 0x1c($sp) /* 427528 802A9178 0080982D */ daddu $s3, $a0, $zero /* 42752C 802A917C AFB10014 */ sw $s1, 0x14($sp) -/* 427530 802A9180 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 427534 802A9184 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 427530 802A9180 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 427534 802A9184 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 427538 802A9188 AFB20018 */ sw $s2, 0x18($sp) /* 42753C 802A918C 3C12800E */ lui $s2, %hi(gBattleStatus) /* 427540 802A9190 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s index a594e58d01..c44abd1b31 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A928C_42763C.s @@ -4,8 +4,8 @@ glabel func_802A928C_42763C /* 42763C 802A928C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 427640 802A9290 AFB10014 */ sw $s1, 0x14($sp) -/* 427644 802A9294 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 427648 802A9298 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 427644 802A9294 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 427648 802A9298 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42764C 802A929C AFBF001C */ sw $ra, 0x1c($sp) /* 427650 802A92A0 AFB20018 */ sw $s2, 0x18($sp) /* 427654 802A92A4 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A955C_42790C.s b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A955C_42790C.s index bff8e366ab..ef563f76cd 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A955C_42790C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A955C_42790C.s @@ -4,8 +4,8 @@ glabel func_802A955C_42790C /* 42790C 802A955C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 427910 802A9560 AFB1001C */ sw $s1, 0x1c($sp) -/* 427914 802A9564 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 427918 802A9568 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 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 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9000_428A70.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9000_428A70.s index fcb59d87f2..0e9974e2df 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9000_428A70.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9000_428A70.s @@ -23,8 +23,8 @@ glabel func_802A9000_428A70 /* 428AB8 802A9048 0200202D */ daddu $a0, $s0, $zero /* 428ABC 802A904C 3C048011 */ lui $a0, %hi(D_80108B28) /* 428AC0 802A9050 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) -/* 428AC4 802A9054 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 428AC8 802A9058 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 428AC4 802A9054 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 428AC8 802A9058 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 428ACC 802A905C A602005A */ sh $v0, 0x5a($s0) /* 428AD0 802A9060 2402000D */ addiu $v0, $zero, 0xd /* 428AD4 802A9064 A602004A */ sh $v0, 0x4a($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9184_428BF4.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9184_428BF4.s index 2102573266..1f1355fabb 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9184_428BF4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9184_428BF4.s @@ -14,8 +14,8 @@ glabel func_802A9184_428BF4 /* 428C18 802A91A8 8E050000 */ lw $a1, ($s0) /* 428C1C 802A91AC 0C0B1EAF */ jal get_variable /* 428C20 802A91B0 26100004 */ addiu $s0, $s0, 4 -/* 428C24 802A91B4 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 428C28 802A91B8 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 428C24 802A91B4 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 428C28 802A91B8 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 428C2C 802A91BC A622004E */ sh $v0, 0x4e($s1) /* 428C30 802A91C0 8E050000 */ lw $a1, ($s0) /* 428C34 802A91C4 26100004 */ addiu $s0, $s0, 4 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s index dbae1602d0..ce73fe2cee 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s @@ -4,8 +4,8 @@ glabel func_802A9278_428CE8 /* 428CE8 802A9278 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 428CEC 802A927C AFB10014 */ sw $s1, 0x14($sp) -/* 428CF0 802A9280 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 428CF4 802A9284 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 428CF0 802A9280 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 428CF4 802A9284 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 428CF8 802A9288 AFBF001C */ sw $ra, 0x1c($sp) /* 428CFC 802A928C AFB20018 */ sw $s2, 0x18($sp) /* 428D00 802A9290 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s index a5939e6048..72b9b074ac 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s @@ -6,8 +6,8 @@ glabel func_802A96EC_42915C /* 429160 802A96F0 8042C0F3 */ lb $v0, %lo(gBattleStatus+0x83)($v0) /* 429164 802A96F4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 429168 802A96F8 AFB1001C */ sw $s1, 0x1c($sp) -/* 42916C 802A96FC 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 429170 802A9700 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42916C 802A96FC 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 429170 802A9700 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 429174 802A9704 AFBF0020 */ sw $ra, 0x20($sp) /* 429178 802A9708 10400004 */ beqz $v0, .L802A971C /* 42917C 802A970C AFB00018 */ sw $s0, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9000_429320.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9000_429320.s index 5d3539d0d0..7d752e3777 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9000_429320.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9000_429320.s @@ -14,8 +14,8 @@ glabel func_802A9000_429320 /* 429344 802A9024 24424360 */ addiu $v0, $v0, %lo(D_80294360) /* 429348 802A9028 AE020434 */ sw $v0, 0x434($s0) /* 42934C 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 429350 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 429354 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 429350 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 429354 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 429358 802A9038 A2020086 */ sb $v0, 0x86($s0) /* 42935C 802A903C 82020083 */ lb $v0, 0x83($s0) /* 429360 802A9040 10400046 */ beqz $v0, .L802A915C diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9178_429498.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9178_429498.s index a2d0143c5f..59a715ca23 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9178_429498.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9178_429498.s @@ -6,8 +6,8 @@ glabel func_802A9178_429498 /* 42949C 802A917C AFB3001C */ sw $s3, 0x1c($sp) /* 4294A0 802A9180 0080982D */ daddu $s3, $a0, $zero /* 4294A4 802A9184 AFB10014 */ sw $s1, 0x14($sp) -/* 4294A8 802A9188 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4294AC 802A918C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4294A8 802A9188 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4294AC 802A918C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4294B0 802A9190 AFB20018 */ sw $s2, 0x18($sp) /* 4294B4 802A9194 3C12800E */ lui $s2, %hi(gBattleStatus) /* 4294B8 802A9198 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s index d3c0a08c8f..7ce890f13b 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9294_4295B4.s @@ -4,8 +4,8 @@ glabel func_802A9294_4295B4 /* 4295B4 802A9294 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 4295B8 802A9298 AFB10014 */ sw $s1, 0x14($sp) -/* 4295BC 802A929C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4295C0 802A92A0 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4295BC 802A929C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4295C0 802A92A0 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4295C4 802A92A4 AFB20018 */ sw $s2, 0x18($sp) /* 4295C8 802A92A8 3C12800E */ lui $s2, %hi(gBattleStatus) /* 4295CC 802A92AC 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A984C_429B6C.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A984C_429B6C.s index 997c3c0a23..02f693b730 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A984C_429B6C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A984C_429B6C.s @@ -4,8 +4,8 @@ glabel func_802A984C_429B6C /* 429B6C 802A984C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 429B70 802A9850 AFB1001C */ sw $s1, 0x1c($sp) -/* 429B74 802A9854 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 429B78 802A9858 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 429B74 802A9854 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 429B78 802A9858 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 429B7C 802A985C AFBF0020 */ sw $ra, 0x20($sp) /* 429B80 802A9860 AFB00018 */ sw $s0, 0x18($sp) /* 429B84 802A9864 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9000_4282E0.s b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9000_4282E0.s index 65ab0c6e21..e02dabb699 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9000_4282E0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9000_4282E0.s @@ -14,8 +14,8 @@ glabel func_802A9000_4282E0 /* 428304 802A9024 24424320 */ addiu $v0, $v0, %lo(D_80294320) /* 428308 802A9028 AE020434 */ sw $v0, 0x434($s0) /* 42830C 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 428310 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 428314 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 428310 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 428314 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 428318 802A9038 A2020086 */ sb $v0, 0x86($s0) /* 42831C 802A903C 82020083 */ lb $v0, 0x83($s0) /* 428320 802A9040 10400056 */ beqz $v0, .L802A919C diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A91B8_428498.s b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A91B8_428498.s index deb2ae6ca7..6fc89d457b 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A91B8_428498.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A91B8_428498.s @@ -6,8 +6,8 @@ glabel func_802A91B8_428498 /* 42849C 802A91BC AFB3001C */ sw $s3, 0x1c($sp) /* 4284A0 802A91C0 0080982D */ daddu $s3, $a0, $zero /* 4284A4 802A91C4 AFB10014 */ sw $s1, 0x14($sp) -/* 4284A8 802A91C8 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4284AC 802A91CC 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4284A8 802A91C8 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4284AC 802A91CC 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4284B0 802A91D0 AFB20018 */ sw $s2, 0x18($sp) /* 4284B4 802A91D4 3C12800E */ lui $s2, %hi(gBattleStatus) /* 4284B8 802A91D8 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s index f027cd63cb..c65236e3e2 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A92D4_4285B4.s @@ -4,8 +4,8 @@ glabel func_802A92D4_4285B4 /* 4285B4 802A92D4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 4285B8 802A92D8 AFB10014 */ sw $s1, 0x14($sp) -/* 4285BC 802A92DC 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4285C0 802A92E0 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4285BC 802A92DC 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4285C0 802A92E0 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4285C4 802A92E4 AFBF0018 */ sw $ra, 0x18($sp) /* 4285C8 802A92E8 AFB00010 */ sw $s0, 0x10($sp) /* 4285CC 802A92EC 8623004C */ lh $v1, 0x4c($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9664_428944.s b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9664_428944.s index 6817788c00..b2afe19843 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9664_428944.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9664_428944.s @@ -4,8 +4,8 @@ glabel func_802A9664_428944 /* 428944 802A9664 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 428948 802A9668 AFB1001C */ sw $s1, 0x1c($sp) -/* 42894C 802A966C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 428950 802A9670 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42894C 802A966C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 428950 802A9670 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 428954 802A9674 AFBF0020 */ sw $ra, 0x20($sp) /* 428958 802A9678 AFB00018 */ sw $s0, 0x18($sp) /* 42895C 802A967C 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9708_4289E8.s b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9708_4289E8.s index 2fa73bd6a9..291fd11b1b 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9708_4289E8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/body_slam/func_802A9708_4289E8.s @@ -4,8 +4,8 @@ glabel func_802A9708_4289E8 /* 4289E8 802A9708 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4289EC 802A970C AFB00010 */ sw $s0, 0x10($sp) -/* 4289F0 802A9710 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 4289F4 802A9714 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 4289F0 802A9710 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 4289F4 802A9714 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 4289F8 802A9718 AFBF0014 */ sw $ra, 0x14($sp) /* 4289FC 802A971C 0C05123D */ jal free_hud_element /* 428A00 802A9720 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9000_427A70.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9000_427A70.s index 5df3ea0d94..7be86252df 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9000_427A70.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9000_427A70.s @@ -14,8 +14,8 @@ glabel func_802A9000_427A70 /* 427A94 802A9024 24424300 */ addiu $v0, $v0, %lo(D_80294300) /* 427A98 802A9028 AE020434 */ sw $v0, 0x434($s0) /* 427A9C 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 427AA0 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 427AA4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 427AA0 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 427AA4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 427AA8 802A9038 A2020086 */ sb $v0, 0x86($s0) /* 427AAC 802A903C 82020083 */ lb $v0, 0x83($s0) /* 427AB0 802A9040 10400044 */ beqz $v0, .L802A9154 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9170_427BE0.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9170_427BE0.s index 057c55ed05..9f7ad7ed32 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9170_427BE0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9170_427BE0.s @@ -6,8 +6,8 @@ glabel func_802A9170_427BE0 /* 427BE4 802A9174 AFB3001C */ sw $s3, 0x1c($sp) /* 427BE8 802A9178 0080982D */ daddu $s3, $a0, $zero /* 427BEC 802A917C AFB10014 */ sw $s1, 0x14($sp) -/* 427BF0 802A9180 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 427BF4 802A9184 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 427BF0 802A9180 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 427BF4 802A9184 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 427BF8 802A9188 AFB20018 */ sw $s2, 0x18($sp) /* 427BFC 802A918C 3C12800E */ lui $s2, %hi(gBattleStatus) /* 427C00 802A9190 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s index 1e1a9dbdc9..380d01f0fc 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s @@ -4,8 +4,8 @@ glabel func_802A928C_427CFC /* 427CFC 802A928C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 427D00 802A9290 AFB10014 */ sw $s1, 0x14($sp) -/* 427D04 802A9294 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 427D08 802A9298 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 427D04 802A9294 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 427D08 802A9298 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 427D0C 802A929C AFBF001C */ sw $ra, 0x1c($sp) /* 427D10 802A92A0 AFB20018 */ sw $s2, 0x18($sp) /* 427D14 802A92A4 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A96EC_42815C.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A96EC_42815C.s index 758a247816..9e981ce3b3 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A96EC_42815C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A96EC_42815C.s @@ -4,8 +4,8 @@ glabel func_802A96EC_42815C /* 42815C 802A96EC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 428160 802A96F0 AFB1001C */ sw $s1, 0x1c($sp) -/* 428164 802A96F4 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 428168 802A96F8 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 428164 802A96F4 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 428168 802A96F8 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42816C 802A96FC AFBF0020 */ sw $ra, 0x20($sp) /* 428170 802A9700 AFB00018 */ sw $s0, 0x18($sp) /* 428174 802A9704 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A9000_4233F0.s b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A9000_4233F0.s index f3ea0f7384..e2fd93f87e 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A9000_4233F0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A9000_4233F0.s @@ -12,8 +12,8 @@ glabel func_802A9000_4233F0 /* 42340C 802A901C AFB10014 */ sw $s1, 0x14($sp) /* 423410 802A9020 AE020434 */ sw $v0, 0x434($s0) /* 423414 802A9024 2402007F */ addiu $v0, $zero, 0x7f -/* 423418 802A9028 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42341C 802A902C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 423418 802A9028 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42341C 802A902C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 423420 802A9030 A2020086 */ sb $v0, 0x86($s0) /* 423424 802A9034 82020083 */ lb $v0, 0x83($s0) /* 423428 802A9038 0200182D */ daddu $v1, $s0, $zero diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A91B0_4235A0.s b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A91B0_4235A0.s index 5cb3ae869f..f48ad1557c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A91B0_4235A0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A91B0_4235A0.s @@ -6,8 +6,8 @@ glabel func_802A91B0_4235A0 /* 4235A4 802A91B4 AFB20018 */ sw $s2, 0x18($sp) /* 4235A8 802A91B8 0080902D */ daddu $s2, $a0, $zero /* 4235AC 802A91BC AFB10014 */ sw $s1, 0x14($sp) -/* 4235B0 802A91C0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4235B4 802A91C4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4235B0 802A91C0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4235B4 802A91C4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4235B8 802A91C8 AFB3001C */ sw $s3, 0x1c($sp) /* 4235BC 802A91CC 3C13800E */ lui $s3, %hi(gBattleStatus) /* 4235C0 802A91D0 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s index 09e3cdb05d..b453544409 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A92DC_4236CC.s @@ -4,8 +4,8 @@ glabel func_802A92DC_4236CC /* 4236CC 802A92DC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 4236D0 802A92E0 AFB10014 */ sw $s1, 0x14($sp) -/* 4236D4 802A92E4 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4236D8 802A92E8 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4236D4 802A92E4 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4236D8 802A92E8 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4236DC 802A92EC AFBF0018 */ sw $ra, 0x18($sp) /* 4236E0 802A92F0 AFB00010 */ sw $s0, 0x10($sp) /* 4236E4 802A92F4 8623004C */ lh $v1, 0x4c($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A96B8_423AA8.s b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A96B8_423AA8.s index cc78e00d3c..fe045d1835 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A96B8_423AA8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A96B8_423AA8.s @@ -4,8 +4,8 @@ glabel func_802A96B8_423AA8 /* 423AA8 802A96B8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 423AAC 802A96BC AFB00018 */ sw $s0, 0x18($sp) -/* 423AB0 802A96C0 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 423AB4 802A96C4 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 423AB0 802A96C0 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 423AB4 802A96C4 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 423AB8 802A96C8 AFBF0020 */ sw $ra, 0x20($sp) /* 423ABC 802A96CC AFB1001C */ sw $s1, 0x1c($sp) /* 423AC0 802A96D0 82020080 */ lb $v0, 0x80($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A97FC_423BEC.s b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A97FC_423BEC.s index 7e0d685a84..0e888ec44d 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A97FC_423BEC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A97FC_423BEC.s @@ -4,8 +4,8 @@ glabel func_802A97FC_423BEC /* 423BEC 802A97FC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 423BF0 802A9800 AFB00010 */ sw $s0, 0x10($sp) -/* 423BF4 802A9804 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 423BF8 802A9808 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 423BF4 802A9804 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 423BF8 802A9808 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 423BFC 802A980C AFBF0014 */ sw $ra, 0x14($sp) /* 423C00 802A9810 0C05123D */ jal free_hud_element /* 423C04 802A9814 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9000_426170.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9000_426170.s index 6ea8988f18..4372984fbe 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9000_426170.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9000_426170.s @@ -14,8 +14,8 @@ glabel func_802A9000_426170 /* 426194 802A9024 244242A0 */ addiu $v0, $v0, %lo(D_802942A0) /* 426198 802A9028 AE020434 */ sw $v0, 0x434($s0) /* 42619C 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 4261A0 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4261A4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4261A0 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4261A4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4261A8 802A9038 A2020086 */ sb $v0, 0x86($s0) /* 4261AC 802A903C 82020083 */ lb $v0, 0x83($s0) /* 4261B0 802A9040 10400044 */ beqz $v0, .L802A9154 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9170_4262E0.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9170_4262E0.s index e315b2b129..5e86d917b6 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9170_4262E0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9170_4262E0.s @@ -6,8 +6,8 @@ glabel func_802A9170_4262E0 /* 4262E4 802A9174 AFB3001C */ sw $s3, 0x1c($sp) /* 4262E8 802A9178 0080982D */ daddu $s3, $a0, $zero /* 4262EC 802A917C AFB10014 */ sw $s1, 0x14($sp) -/* 4262F0 802A9180 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4262F4 802A9184 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4262F0 802A9180 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4262F4 802A9184 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4262F8 802A9188 AFB20018 */ sw $s2, 0x18($sp) /* 4262FC 802A918C 3C12800E */ lui $s2, %hi(gBattleStatus) /* 426300 802A9190 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s index 91344aa148..0078875bef 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A928C_4263FC.s @@ -4,8 +4,8 @@ glabel func_802A928C_4263FC /* 4263FC 802A928C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 426400 802A9290 AFB10014 */ sw $s1, 0x14($sp) -/* 426404 802A9294 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 426408 802A9298 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 426404 802A9294 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 426408 802A9298 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42640C 802A929C AFBF001C */ sw $ra, 0x1c($sp) /* 426410 802A92A0 AFB20018 */ sw $s2, 0x18($sp) /* 426414 802A92A4 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A96DC_42684C.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A96DC_42684C.s index 32b92b66b6..9db62c8dbe 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A96DC_42684C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A96DC_42684C.s @@ -4,8 +4,8 @@ glabel func_802A96DC_42684C /* 42684C 802A96DC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 426850 802A96E0 AFB1001C */ sw $s1, 0x1c($sp) -/* 426854 802A96E4 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 426858 802A96E8 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 426854 802A96E4 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 426858 802A96E8 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42685C 802A96EC AFBF0020 */ sw $ra, 0x20($sp) /* 426860 802A96F0 AFB00018 */ sw $s0, 0x18($sp) /* 426864 802A96F4 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9000_4269D0.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9000_4269D0.s index 37af7945a7..46158cb577 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9000_4269D0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9000_4269D0.s @@ -14,8 +14,8 @@ glabel func_802A9000_4269D0 /* 4269F4 802A9024 244242C0 */ addiu $v0, $v0, %lo(D_802942C0) /* 4269F8 802A9028 AE020434 */ sw $v0, 0x434($s0) /* 4269FC 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 426A00 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 426A04 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 426A00 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 426A04 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 426A08 802A9038 A2020086 */ sb $v0, 0x86($s0) /* 426A0C 802A903C 82020083 */ lb $v0, 0x83($s0) /* 426A10 802A9040 10400046 */ beqz $v0, .L802A915C diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9178_426B48.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9178_426B48.s index aae0afacfb..5484a60ab5 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9178_426B48.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9178_426B48.s @@ -6,8 +6,8 @@ glabel func_802A9178_426B48 /* 426B4C 802A917C AFB3001C */ sw $s3, 0x1c($sp) /* 426B50 802A9180 0080982D */ daddu $s3, $a0, $zero /* 426B54 802A9184 AFB10014 */ sw $s1, 0x14($sp) -/* 426B58 802A9188 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 426B5C 802A918C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 426B58 802A9188 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 426B5C 802A918C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 426B60 802A9190 AFB20018 */ sw $s2, 0x18($sp) /* 426B64 802A9194 3C12800E */ lui $s2, %hi(gBattleStatus) /* 426B68 802A9198 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s index 5ac42ec1ec..4388228614 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9294_426C64.s @@ -4,8 +4,8 @@ glabel func_802A9294_426C64 /* 426C64 802A9294 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 426C68 802A9298 AFB10014 */ sw $s1, 0x14($sp) -/* 426C6C 802A929C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 426C70 802A92A0 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 426C6C 802A929C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 426C70 802A92A0 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 426C74 802A92A4 AFB20018 */ sw $s2, 0x18($sp) /* 426C78 802A92A8 3C12800E */ lui $s2, %hi(gBattleStatus) /* 426C7C 802A92AC 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9834_427204.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9834_427204.s index 23af52e11d..d1f97131eb 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9834_427204.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9834_427204.s @@ -4,8 +4,8 @@ glabel func_802A9834_427204 /* 427204 802A9834 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 427208 802A9838 AFB1001C */ sw $s1, 0x1c($sp) -/* 42720C 802A983C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 427210 802A9840 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42720C 802A983C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 427210 802A9840 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 427214 802A9844 AFBF0020 */ sw $ra, 0x20($sp) /* 427218 802A9848 AFB00018 */ sw $s0, 0x18($sp) /* 42721C 802A984C 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9000_422AD0.s b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9000_422AD0.s index 7f550d90a9..3babc18ce5 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9000_422AD0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9000_422AD0.s @@ -22,8 +22,8 @@ glabel func_802A9000_422AD0 /* 422B14 802A9044 0C0B1EAF */ jal get_variable /* 422B18 802A9048 0200202D */ daddu $a0, $s0, $zero /* 422B1C 802A904C 24040032 */ addiu $a0, $zero, 0x32 -/* 422B20 802A9050 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 422B24 802A9054 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 422B20 802A9050 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 422B24 802A9054 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 422B28 802A9058 24030003 */ addiu $v1, $zero, 3 /* 422B2C 802A905C A602005A */ sh $v0, 0x5a($s0) /* 422B30 802A9060 00021400 */ sll $v0, $v0, 0x10 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A92A0_422D70.s b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A92A0_422D70.s index 50b8938285..95a38e49cc 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A92A0_422D70.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A92A0_422D70.s @@ -14,8 +14,8 @@ glabel func_802A92A0_422D70 /* 422D94 802A92C4 8E050000 */ lw $a1, ($s0) /* 422D98 802A92C8 0C0B1EAF */ jal get_variable /* 422D9C 802A92CC 26100004 */ addiu $s0, $s0, 4 -/* 422DA0 802A92D0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 422DA4 802A92D4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 422DA0 802A92D0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 422DA4 802A92D4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 422DA8 802A92D8 A622004E */ sh $v0, 0x4e($s1) /* 422DAC 802A92DC 8E050000 */ lw $a1, ($s0) /* 422DB0 802A92E0 26100004 */ addiu $s0, $s0, 4 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9378_422E48.s b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9378_422E48.s index 24b3d4c38d..ddeffc1131 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9378_422E48.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9378_422E48.s @@ -4,8 +4,8 @@ glabel func_802A9378_422E48 /* 422E48 802A9378 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 422E4C 802A937C AFB10014 */ sw $s1, 0x14($sp) -/* 422E50 802A9380 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 422E54 802A9384 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 422E50 802A9380 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 422E54 802A9384 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 422E58 802A9388 AFBF001C */ sw $ra, 0x1c($sp) /* 422E5C 802A938C AFB20018 */ sw $s2, 0x18($sp) /* 422E60 802A9390 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A96F4_4231C4.s b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A96F4_4231C4.s index 3be6a46ba6..0464df1b90 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A96F4_4231C4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A96F4_4231C4.s @@ -7,8 +7,8 @@ glabel func_802A96F4_4231C4 /* 4231CC 802A96FC 3C1251EB */ lui $s2, 0x51eb /* 4231D0 802A9700 3652851F */ ori $s2, $s2, 0x851f /* 4231D4 802A9704 AFB1001C */ sw $s1, 0x1c($sp) -/* 4231D8 802A9708 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4231DC 802A970C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4231D8 802A9708 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4231DC 802A970C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4231E0 802A9710 AFBF0024 */ sw $ra, 0x24($sp) /* 4231E4 802A9714 AFB00018 */ sw $s0, 0x18($sp) /* 4231E8 802A9718 86230046 */ lh $v1, 0x46($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9894_423364.s b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9894_423364.s index f9595d3467..88528b7ccd 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9894_423364.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/flee/func_802A9894_423364.s @@ -4,8 +4,8 @@ glabel func_802A9894_423364 /* 423364 802A9894 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 423368 802A9898 AFB00010 */ sw $s0, 0x10($sp) -/* 42336C 802A989C 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 423370 802A98A0 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 42336C 802A989C 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 423370 802A98A0 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 423374 802A98A4 AFBF0014 */ sw $ra, 0x14($sp) /* 423378 802A98A8 0C05123D */ jal free_hud_element /* 42337C 802A98AC 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9000_422000.s b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9000_422000.s deleted file mode 100644 index b3eae2a65b..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9000_422000.s +++ /dev/null @@ -1,156 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_422000 -/* 422000 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 422004 802A9004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 422008 802A9008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 42200C 802A900C 24020001 */ addiu $v0, $zero, 1 -/* 422010 802A9010 AFBF0018 */ sw $ra, 0x18($sp) -/* 422014 802A9014 AFB10014 */ sw $s1, 0x14($sp) -/* 422018 802A9018 AFB00010 */ sw $s0, 0x10($sp) -/* 42201C 802A901C A0620082 */ sb $v0, 0x82($v1) -/* 422020 802A9020 3C028029 */ lui $v0, %hi(D_802941E0) -/* 422024 802A9024 244241E0 */ addiu $v0, $v0, %lo(D_802941E0) -/* 422028 802A9028 AC620434 */ sw $v0, 0x434($v1) -/* 42202C 802A902C 80620083 */ lb $v0, 0x83($v1) -/* 422030 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 422034 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) -/* 422038 802A9038 1040007F */ beqz $v0, .L802A9238 -/* 42203C 802A903C A0600086 */ sb $zero, 0x86($v1) -/* 422040 802A9040 0C09A216 */ jal func_80268858 -/* 422044 802A9044 00000000 */ nop -/* 422048 802A9048 3C048029 */ lui $a0, %hi(D_802922F0) -/* 42204C 802A904C 248422F0 */ addiu $a0, $a0, %lo(D_802922F0) -/* 422050 802A9050 24020002 */ addiu $v0, $zero, 2 -/* 422054 802A9054 A622004A */ sh $v0, 0x4a($s1) -/* 422058 802A9058 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 42205C 802A905C A6220056 */ sh $v0, 0x56($s1) -/* 422060 802A9060 24020060 */ addiu $v0, $zero, 0x60 -/* 422064 802A9064 A620004C */ sh $zero, 0x4c($s1) -/* 422068 802A9068 A2200060 */ sb $zero, 0x60($s1) -/* 42206C 802A906C 0C050529 */ jal create_hud_element -/* 422070 802A9070 A6220058 */ sh $v0, 0x58($s1) -/* 422074 802A9074 0040802D */ daddu $s0, $v0, $zero -/* 422078 802A9078 0200202D */ daddu $a0, $s0, $zero -/* 42207C 802A907C 24050082 */ addiu $a1, $zero, 0x82 -/* 422080 802A9080 0C051280 */ jal set_hud_element_flags -/* 422084 802A9084 AE300004 */ sw $s0, 4($s1) -/* 422088 802A9088 86250056 */ lh $a1, 0x56($s1) -/* 42208C 802A908C 86260058 */ lh $a2, 0x58($s1) -/* 422090 802A9090 0C051261 */ jal set_hud_element_render_pos -/* 422094 802A9094 0200202D */ daddu $a0, $s0, $zero -/* 422098 802A9098 0200202D */ daddu $a0, $s0, $zero -/* 42209C 802A909C 0C051277 */ jal set_hud_element_render_depth -/* 4220A0 802A90A0 2405000A */ addiu $a1, $zero, 0xa -/* 4220A4 802A90A4 3C048029 */ lui $a0, %hi(D_8029275C) -/* 4220A8 802A90A8 2484275C */ addiu $a0, $a0, %lo(D_8029275C) -/* 4220AC 802A90AC 0C050529 */ jal create_hud_element -/* 4220B0 802A90B0 00000000 */ nop -/* 4220B4 802A90B4 0040802D */ daddu $s0, $v0, $zero -/* 4220B8 802A90B8 0200202D */ daddu $a0, $s0, $zero -/* 4220BC 802A90BC 24050082 */ addiu $a1, $zero, 0x82 -/* 4220C0 802A90C0 0C051280 */ jal set_hud_element_flags -/* 4220C4 802A90C4 AE300008 */ sw $s0, 8($s1) -/* 4220C8 802A90C8 86250056 */ lh $a1, 0x56($s1) -/* 4220CC 802A90CC 86260058 */ lh $a2, 0x58($s1) -/* 4220D0 802A90D0 0C051261 */ jal set_hud_element_render_pos -/* 4220D4 802A90D4 0200202D */ daddu $a0, $s0, $zero -/* 4220D8 802A90D8 0200202D */ daddu $a0, $s0, $zero -/* 4220DC 802A90DC 0C051277 */ jal set_hud_element_render_depth -/* 4220E0 802A90E0 0000282D */ daddu $a1, $zero, $zero -/* 4220E4 802A90E4 3C048029 */ lui $a0, %hi(D_802927F0) -/* 4220E8 802A90E8 248427F0 */ addiu $a0, $a0, %lo(D_802927F0) -/* 4220EC 802A90EC 0C050529 */ jal create_hud_element -/* 4220F0 802A90F0 00000000 */ nop -/* 4220F4 802A90F4 0040802D */ daddu $s0, $v0, $zero -/* 4220F8 802A90F8 0200202D */ daddu $a0, $s0, $zero -/* 4220FC 802A90FC 24050082 */ addiu $a1, $zero, 0x82 -/* 422100 802A9100 0C051280 */ jal set_hud_element_flags -/* 422104 802A9104 AE30000C */ sw $s0, 0xc($s1) -/* 422108 802A9108 86250056 */ lh $a1, 0x56($s1) -/* 42210C 802A910C 86260058 */ lh $a2, 0x58($s1) -/* 422110 802A9110 0C051261 */ jal set_hud_element_render_pos -/* 422114 802A9114 0200202D */ daddu $a0, $s0, $zero -/* 422118 802A9118 0200202D */ daddu $a0, $s0, $zero -/* 42211C 802A911C 0C051277 */ jal set_hud_element_render_depth -/* 422120 802A9120 0000282D */ daddu $a1, $zero, $zero -/* 422124 802A9124 3C048029 */ lui $a0, %hi(D_80292848) -/* 422128 802A9128 24842848 */ addiu $a0, $a0, %lo(D_80292848) -/* 42212C 802A912C 0C050529 */ jal create_hud_element -/* 422130 802A9130 00000000 */ nop -/* 422134 802A9134 0040802D */ daddu $s0, $v0, $zero -/* 422138 802A9138 0200202D */ daddu $a0, $s0, $zero -/* 42213C 802A913C 24050082 */ addiu $a1, $zero, 0x82 -/* 422140 802A9140 0C051280 */ jal set_hud_element_flags -/* 422144 802A9144 AE300010 */ sw $s0, 0x10($s1) -/* 422148 802A9148 86250056 */ lh $a1, 0x56($s1) -/* 42214C 802A914C 86260058 */ lh $a2, 0x58($s1) -/* 422150 802A9150 0C051261 */ jal set_hud_element_render_pos -/* 422154 802A9154 0200202D */ daddu $a0, $s0, $zero -/* 422158 802A9158 0200202D */ daddu $a0, $s0, $zero -/* 42215C 802A915C 0C051277 */ jal set_hud_element_render_depth -/* 422160 802A9160 0000282D */ daddu $a1, $zero, $zero -/* 422164 802A9164 3C048029 */ lui $a0, %hi(D_802928A0) -/* 422168 802A9168 248428A0 */ addiu $a0, $a0, %lo(D_802928A0) -/* 42216C 802A916C 0C050529 */ jal create_hud_element -/* 422170 802A9170 00000000 */ nop -/* 422174 802A9174 0040802D */ daddu $s0, $v0, $zero -/* 422178 802A9178 0200202D */ daddu $a0, $s0, $zero -/* 42217C 802A917C 24050082 */ addiu $a1, $zero, 0x82 -/* 422180 802A9180 0C051280 */ jal set_hud_element_flags -/* 422184 802A9184 AE300014 */ sw $s0, 0x14($s1) -/* 422188 802A9188 86250056 */ lh $a1, 0x56($s1) -/* 42218C 802A918C 86260058 */ lh $a2, 0x58($s1) -/* 422190 802A9190 0C051261 */ jal set_hud_element_render_pos -/* 422194 802A9194 0200202D */ daddu $a0, $s0, $zero -/* 422198 802A9198 0200202D */ daddu $a0, $s0, $zero -/* 42219C 802A919C 0C051277 */ jal set_hud_element_render_depth -/* 4221A0 802A91A0 0000282D */ daddu $a1, $zero, $zero -/* 4221A4 802A91A4 3C048011 */ lui $a0, %hi(D_80108E48) -/* 4221A8 802A91A8 24848E48 */ addiu $a0, $a0, %lo(D_80108E48) -/* 4221AC 802A91AC 0C050529 */ jal create_hud_element -/* 4221B0 802A91B0 00000000 */ nop -/* 4221B4 802A91B4 0040802D */ daddu $s0, $v0, $zero -/* 4221B8 802A91B8 0200202D */ daddu $a0, $s0, $zero -/* 4221BC 802A91BC 24050082 */ addiu $a1, $zero, 0x82 -/* 4221C0 802A91C0 0C051280 */ jal set_hud_element_flags -/* 4221C4 802A91C4 AE300018 */ sw $s0, 0x18($s1) -/* 4221C8 802A91C8 86250056 */ lh $a1, 0x56($s1) -/* 4221CC 802A91CC 86260058 */ lh $a2, 0x58($s1) -/* 4221D0 802A91D0 0C051261 */ jal set_hud_element_render_pos -/* 4221D4 802A91D4 0200202D */ daddu $a0, $s0, $zero -/* 4221D8 802A91D8 0200202D */ daddu $a0, $s0, $zero -/* 4221DC 802A91DC 0C051277 */ jal set_hud_element_render_depth -/* 4221E0 802A91E0 0000282D */ daddu $a1, $zero, $zero -/* 4221E4 802A91E4 3C048029 */ lui $a0, %hi(D_80292A2C) -/* 4221E8 802A91E8 24842A2C */ addiu $a0, $a0, %lo(D_80292A2C) -/* 4221EC 802A91EC 0C050529 */ jal create_hud_element -/* 4221F0 802A91F0 00000000 */ nop -/* 4221F4 802A91F4 0040802D */ daddu $s0, $v0, $zero -/* 4221F8 802A91F8 0200202D */ daddu $a0, $s0, $zero -/* 4221FC 802A91FC 24050082 */ addiu $a1, $zero, 0x82 -/* 422200 802A9200 0C051280 */ jal set_hud_element_flags -/* 422204 802A9204 AE30001C */ sw $s0, 0x1c($s1) -/* 422208 802A9208 86250056 */ lh $a1, 0x56($s1) -/* 42220C 802A920C 86260058 */ lh $a2, 0x58($s1) -/* 422210 802A9210 0C051261 */ jal set_hud_element_render_pos -/* 422214 802A9214 0200202D */ daddu $a0, $s0, $zero -/* 422218 802A9218 0200202D */ daddu $a0, $s0, $zero -/* 42221C 802A921C 0C051277 */ jal set_hud_element_render_depth -/* 422220 802A9220 0000282D */ daddu $a1, $zero, $zero -/* 422224 802A9224 0200202D */ daddu $a0, $s0, $zero -/* 422228 802A9228 0C0513AC */ jal set_hud_element_alpha -/* 42222C 802A922C 240500FF */ addiu $a1, $zero, 0xff -/* 422230 802A9230 080AA491 */ j .L802A9244 -/* 422234 802A9234 24020002 */ addiu $v0, $zero, 2 -.L802A9238: -/* 422238 802A9238 24020002 */ addiu $v0, $zero, 2 -/* 42223C 802A923C A0600081 */ sb $zero, 0x81($v1) -/* 422240 802A9240 A0600084 */ sb $zero, 0x84($v1) -.L802A9244: -/* 422244 802A9244 8FBF0018 */ lw $ra, 0x18($sp) -/* 422248 802A9248 8FB10014 */ lw $s1, 0x14($sp) -/* 42224C 802A924C 8FB00010 */ lw $s0, 0x10($sp) -/* 422250 802A9250 03E00008 */ jr $ra -/* 422254 802A9254 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9258_422258.s b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9258_422258.s deleted file mode 100644 index 6ec8356ed2..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9258_422258.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9258_422258 -/* 422258 802A9258 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 42225C 802A925C AFB20018 */ sw $s2, 0x18($sp) -/* 422260 802A9260 0080902D */ daddu $s2, $a0, $zero -/* 422264 802A9264 AFB10014 */ sw $s1, 0x14($sp) -/* 422268 802A9268 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42226C 802A926C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) -/* 422270 802A9270 AFB40020 */ sw $s4, 0x20($sp) -/* 422274 802A9274 0220A02D */ daddu $s4, $s1, $zero -/* 422278 802A9278 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 42227C 802A927C 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 422280 802A9280 AFB3001C */ sw $s3, 0x1c($sp) -/* 422284 802A9284 AFBF0024 */ sw $ra, 0x24($sp) -/* 422288 802A9288 AFB00010 */ sw $s0, 0x10($sp) -/* 42228C 802A928C 80620083 */ lb $v0, 0x83($v1) -/* 422290 802A9290 8E50000C */ lw $s0, 0xc($s2) -/* 422294 802A9294 14400005 */ bnez $v0, .L802A92AC -/* 422298 802A9298 0060982D */ daddu $s3, $v1, $zero -/* 42229C 802A929C 24020002 */ addiu $v0, $zero, 2 -/* 4222A0 802A92A0 A0600081 */ sb $zero, 0x81($v1) -/* 4222A4 802A92A4 080AA4D3 */ j .L802A934C -/* 4222A8 802A92A8 A0600084 */ sb $zero, 0x84($v1) -.L802A92AC: -/* 4222AC 802A92AC 0C09A216 */ jal func_80268858 -/* 4222B0 802A92B0 00000000 */ nop -/* 4222B4 802A92B4 8E050000 */ lw $a1, ($s0) -/* 4222B8 802A92B8 26100004 */ addiu $s0, $s0, 4 -/* 4222BC 802A92BC 0C0B1EAF */ jal get_variable -/* 4222C0 802A92C0 0240202D */ daddu $a0, $s2, $zero -/* 4222C4 802A92C4 A622004E */ sh $v0, 0x4e($s1) -/* 4222C8 802A92C8 8E050000 */ lw $a1, ($s0) -/* 4222CC 802A92CC 26100004 */ addiu $s0, $s0, 4 -/* 4222D0 802A92D0 0C0B1EAF */ jal get_variable -/* 4222D4 802A92D4 0240202D */ daddu $a0, $s2, $zero -/* 4222D8 802A92D8 A6220052 */ sh $v0, 0x52($s1) -/* 4222DC 802A92DC 8E050000 */ lw $a1, ($s0) -/* 4222E0 802A92E0 0C0B1EAF */ jal get_variable -/* 4222E4 802A92E4 0240202D */ daddu $a0, $s2, $zero -/* 4222E8 802A92E8 00022400 */ sll $a0, $v0, 0x10 -/* 4222EC 802A92EC 00042403 */ sra $a0, $a0, 0x10 -/* 4222F0 802A92F0 0C09A089 */ jal func_80268224 -/* 4222F4 802A92F4 A6220050 */ sh $v0, 0x50($s1) -/* 4222F8 802A92F8 8623004E */ lh $v1, 0x4e($s1) -/* 4222FC 802A92FC A6220050 */ sh $v0, 0x50($s1) -/* 422300 802A9300 24020001 */ addiu $v0, $zero, 1 -/* 422304 802A9304 A2200060 */ sb $zero, 0x60($s1) -/* 422308 802A9308 04610003 */ bgez $v1, .L802A9318 -/* 42230C 802A930C A2220062 */ sb $v0, 0x62($s1) -/* 422310 802A9310 A620004E */ sh $zero, 0x4e($s1) -/* 422314 802A9314 A2200062 */ sb $zero, 0x62($s1) -.L802A9318: -/* 422318 802A9318 3C02FFFF */ lui $v0, 0xffff -/* 42231C 802A931C 34427FFF */ ori $v0, $v0, 0x7fff -/* 422320 802A9320 A280005F */ sb $zero, 0x5f($s4) -/* 422324 802A9324 8E630000 */ lw $v1, ($s3) -/* 422328 802A9328 2404000A */ addiu $a0, $zero, 0xa -/* 42232C 802A932C A2600081 */ sb $zero, 0x81($s3) -/* 422330 802A9330 A2600084 */ sb $zero, 0x84($s3) -/* 422334 802A9334 A2600086 */ sb $zero, 0x86($s3) -/* 422338 802A9338 A684004C */ sh $a0, 0x4c($s4) -/* 42233C 802A933C 00621824 */ and $v1, $v1, $v0 -/* 422340 802A9340 0C09A446 */ jal func_80269118 -/* 422344 802A9344 AE630000 */ sw $v1, ($s3) -/* 422348 802A9348 24020002 */ addiu $v0, $zero, 2 -.L802A934C: -/* 42234C 802A934C 8FBF0024 */ lw $ra, 0x24($sp) -/* 422350 802A9350 8FB40020 */ lw $s4, 0x20($sp) -/* 422354 802A9354 8FB3001C */ lw $s3, 0x1c($sp) -/* 422358 802A9358 8FB20018 */ lw $s2, 0x18($sp) -/* 42235C 802A935C 8FB10014 */ lw $s1, 0x14($sp) -/* 422360 802A9360 8FB00010 */ lw $s0, 0x10($sp) -/* 422364 802A9364 03E00008 */ jr $ra -/* 422368 802A9368 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s index b4ffc5d7cc..2f5adfbbde 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A936C_42236C.s @@ -4,8 +4,8 @@ glabel func_802A936C_42236C /* 42236C 802A936C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 422370 802A9370 AFB10014 */ sw $s1, 0x14($sp) -/* 422374 802A9374 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 422378 802A9378 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 422374 802A9374 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 422378 802A9378 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42237C 802A937C AFBF001C */ sw $ra, 0x1c($sp) /* 422380 802A9380 AFB20018 */ sw $s2, 0x18($sp) /* 422384 802A9384 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A99D4_4229D4.s b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A99D4_4229D4.s deleted file mode 100644 index 86555e9481..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A99D4_4229D4.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A99D4_4229D4 -/* 4229D4 802A99D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 4229D8 802A99D8 AFB00010 */ sw $s0, 0x10($sp) -/* 4229DC 802A99DC 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 4229E0 802A99E0 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 4229E4 802A99E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 4229E8 802A99E8 0C0511EA */ jal draw_hud_element_clipped -/* 4229EC 802A99EC 8E040004 */ lw $a0, 4($s0) -/* 4229F0 802A99F0 0C0511EA */ jal draw_hud_element_clipped -/* 4229F4 802A99F4 8E040008 */ lw $a0, 8($s0) -/* 4229F8 802A99F8 0C0511EA */ jal draw_hud_element_clipped -/* 4229FC 802A99FC 8E04000C */ lw $a0, 0xc($s0) -/* 422A00 802A9A00 0C0511EA */ jal draw_hud_element_clipped -/* 422A04 802A9A04 8E040010 */ lw $a0, 0x10($s0) -/* 422A08 802A9A08 0C0511EA */ jal draw_hud_element_clipped -/* 422A0C 802A9A0C 8E040014 */ lw $a0, 0x14($s0) -/* 422A10 802A9A10 0C0511EA */ jal draw_hud_element_clipped -/* 422A14 802A9A14 8E040018 */ lw $a0, 0x18($s0) -/* 422A18 802A9A18 0C0511EA */ jal draw_hud_element_clipped -/* 422A1C 802A9A1C 8E04001C */ lw $a0, 0x1c($s0) -/* 422A20 802A9A20 8FBF0014 */ lw $ra, 0x14($sp) -/* 422A24 802A9A24 8FB00010 */ lw $s0, 0x10($sp) -/* 422A28 802A9A28 03E00008 */ jr $ra -/* 422A2C 802A9A2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9A30_422A30.s b/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9A30_422A30.s deleted file mode 100644 index 46c956c5e2..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hammer/func_802A9A30_422A30.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9A30_422A30 -/* 422A30 802A9A30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 422A34 802A9A34 AFB00010 */ sw $s0, 0x10($sp) -/* 422A38 802A9A38 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 422A3C 802A9A3C 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 422A40 802A9A40 AFBF0014 */ sw $ra, 0x14($sp) -/* 422A44 802A9A44 0C05123D */ jal free_hud_element -/* 422A48 802A9A48 8E040004 */ lw $a0, 4($s0) -/* 422A4C 802A9A4C 0C05123D */ jal free_hud_element -/* 422A50 802A9A50 8E040008 */ lw $a0, 8($s0) -/* 422A54 802A9A54 0C05123D */ jal free_hud_element -/* 422A58 802A9A58 8E04000C */ lw $a0, 0xc($s0) -/* 422A5C 802A9A5C 0C05123D */ jal free_hud_element -/* 422A60 802A9A60 8E040010 */ lw $a0, 0x10($s0) -/* 422A64 802A9A64 0C05123D */ jal free_hud_element -/* 422A68 802A9A68 8E040014 */ lw $a0, 0x14($s0) -/* 422A6C 802A9A6C 0C05123D */ jal free_hud_element -/* 422A70 802A9A70 8E040018 */ lw $a0, 0x18($s0) -/* 422A74 802A9A74 0C05123D */ jal free_hud_element -/* 422A78 802A9A78 8E04001C */ lw $a0, 0x1c($s0) -/* 422A7C 802A9A7C 8FBF0014 */ lw $ra, 0x14($sp) -/* 422A80 802A9A80 8FB00010 */ lw $s0, 0x10($sp) -/* 422A84 802A9A84 03E00008 */ jr $ra -/* 422A88 802A9A88 27BD0018 */ addiu $sp, $sp, 0x18 -/* 422A8C 802A9A8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9000_42F6E0.s b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9000_42F6E0.s index 8fd14f24e5..6bf494dea0 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9000_42F6E0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9000_42F6E0.s @@ -14,8 +14,8 @@ glabel func_802A9000_42F6E0 /* 42F704 802A9024 24424420 */ addiu $v0, $v0, %lo(D_80294420) /* 42F708 802A9028 AC620434 */ sw $v0, 0x434($v1) /* 42F70C 802A902C 80620083 */ lb $v0, 0x83($v1) -/* 42F710 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42F714 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42F710 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42F714 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42F718 802A9038 50400053 */ beql $v0, $zero, .L802A9188 /* 42F71C 802A903C A0600081 */ sb $zero, 0x81($v1) /* 42F720 802A9040 0C09A216 */ jal func_80268858 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A91A0_42F880.s b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A91A0_42F880.s index 69b0a4773c..d117cf0e2e 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A91A0_42F880.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A91A0_42F880.s @@ -6,8 +6,8 @@ glabel func_802A91A0_42F880 /* 42F884 802A91A4 AFB20018 */ sw $s2, 0x18($sp) /* 42F888 802A91A8 0080902D */ daddu $s2, $a0, $zero /* 42F88C 802A91AC AFB10014 */ sw $s1, 0x14($sp) -/* 42F890 802A91B0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42F894 802A91B4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42F890 802A91B0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42F894 802A91B4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42F898 802A91B8 AFB3001C */ sw $s3, 0x1c($sp) /* 42F89C 802A91BC 3C13800E */ lui $s3, %hi(gBattleStatus) /* 42F8A0 802A91C0 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s index a24bde7361..a05c3e75f3 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A92A0_42F980.s @@ -4,8 +4,8 @@ glabel func_802A92A0_42F980 /* 42F980 802A92A0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 42F984 802A92A4 AFB10014 */ sw $s1, 0x14($sp) -/* 42F988 802A92A8 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42F98C 802A92AC 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42F988 802A92A8 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42F98C 802A92AC 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42F990 802A92B0 AFBF001C */ sw $ra, 0x1c($sp) /* 42F994 802A92B4 AFB20018 */ sw $s2, 0x18($sp) /* 42F998 802A92B8 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A97AC_42FE8C.s b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A97AC_42FE8C.s index 589748a90a..8e2507e351 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A97AC_42FE8C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A97AC_42FE8C.s @@ -4,8 +4,8 @@ glabel func_802A97AC_42FE8C /* 42FE8C 802A97AC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 42FE90 802A97B0 AFB1001C */ sw $s1, 0x1c($sp) -/* 42FE94 802A97B4 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42FE98 802A97B8 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42FE94 802A97B4 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42FE98 802A97B8 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42FE9C 802A97BC AFBF0020 */ sw $ra, 0x20($sp) /* 42FEA0 802A97C0 AFB00018 */ sw $s0, 0x18($sp) /* 42FEA4 802A97C4 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9894_42FF74.s b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9894_42FF74.s index df2bbfa63f..9dc1814443 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9894_42FF74.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9894_42FF74.s @@ -4,8 +4,8 @@ glabel func_802A9894_42FF74 /* 42FF74 802A9894 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 42FF78 802A9898 AFB00010 */ sw $s0, 0x10($sp) -/* 42FF7C 802A989C 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42FF80 802A98A0 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 42FF7C 802A989C 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 42FF80 802A98A0 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 42FF84 802A98A4 AFBF0014 */ sw $ra, 0x14($sp) /* 42FF88 802A98A8 0C05123D */ jal free_hud_element /* 42FF8C 802A98AC 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9000_4219F0.s b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9000_4219F0.s index 5bdf8f52a3..fc0f609d5b 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9000_4219F0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9000_4219F0.s @@ -14,8 +14,8 @@ glabel func_802A9000_4219F0 /* 421A14 802A9024 244241C0 */ addiu $v0, $v0, %lo(D_802941C0) /* 421A18 802A9028 AC620434 */ sw $v0, 0x434($v1) /* 421A1C 802A902C 80620083 */ lb $v0, 0x83($v1) -/* 421A20 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 421A24 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 421A20 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 421A24 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 421A28 802A9038 10400032 */ beqz $v0, .L802A9104 /* 421A2C 802A903C A0600086 */ sb $zero, 0x86($v1) /* 421A30 802A9040 0C09A216 */ jal func_80268858 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9120_421B10.s b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9120_421B10.s index 3dd023cf21..74c339097c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9120_421B10.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9120_421B10.s @@ -6,8 +6,8 @@ glabel func_802A9120_421B10 /* 421B14 802A9124 AFB20018 */ sw $s2, 0x18($sp) /* 421B18 802A9128 0080902D */ daddu $s2, $a0, $zero /* 421B1C 802A912C AFB10014 */ sw $s1, 0x14($sp) -/* 421B20 802A9130 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 421B24 802A9134 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 421B20 802A9130 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 421B24 802A9134 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 421B28 802A9138 AFB40020 */ sw $s4, 0x20($sp) /* 421B2C 802A913C 0220A02D */ daddu $s4, $s1, $zero /* 421B30 802A9140 3C03800E */ lui $v1, %hi(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9234_421C24.s b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9234_421C24.s index 8f6fe567ce..ef1588897c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9234_421C24.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9234_421C24.s @@ -11,8 +11,8 @@ glabel jtbl_802A95D0_421FC0 glabel func_802A9234_421C24 /* 421C24 802A9234 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 421C28 802A9238 AFB10014 */ sw $s1, 0x14($sp) -/* 421C2C 802A923C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 421C30 802A9240 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 421C2C 802A923C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 421C30 802A9240 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 421C34 802A9244 AFBF001C */ sw $ra, 0x1c($sp) /* 421C38 802A9248 AFB20018 */ sw $s2, 0x18($sp) /* 421C3C 802A924C AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9544_421F34.s b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9544_421F34.s index 29f36f1e25..0f72c7d37b 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9544_421F34.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9544_421F34.s @@ -4,8 +4,8 @@ glabel func_802A9544_421F34 /* 421F34 802A9544 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 421F38 802A9548 AFB00010 */ sw $s0, 0x10($sp) -/* 421F3C 802A954C 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 421F40 802A9550 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 421F3C 802A954C 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 421F40 802A9550 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 421F44 802A9554 AFBF0014 */ sw $ra, 0x14($sp) /* 421F48 802A9558 0C0511EA */ jal draw_hud_element_clipped /* 421F4C 802A955C 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9590_421F80.s b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9590_421F80.s index d295f608c3..e5776dda03 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9590_421F80.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/jump/func_802A9590_421F80.s @@ -4,8 +4,8 @@ glabel func_802A9590_421F80 /* 421F80 802A9590 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 421F84 802A9594 AFB00010 */ sw $s0, 0x10($sp) -/* 421F88 802A9598 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 421F8C 802A959C 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 421F88 802A9598 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 421F8C 802A959C 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 421F90 802A95A0 AFBF0014 */ sw $ra, 0x14($sp) /* 421F94 802A95A4 0C05123D */ jal free_hud_element /* 421F98 802A95A8 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A9000_42DA10.s b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A9000_42DA10.s index 445b2edc28..c184eecfb2 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A9000_42DA10.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A9000_42DA10.s @@ -14,8 +14,8 @@ glabel func_802A9000_42DA10 /* 42DA34 802A9024 244243C0 */ addiu $v0, $v0, %lo(D_802943C0) /* 42DA38 802A9028 AC620434 */ sw $v0, 0x434($v1) /* 42DA3C 802A902C 80620083 */ lb $v0, 0x83($v1) -/* 42DA40 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42DA44 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42DA40 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42DA44 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42DA48 802A9038 50400053 */ beql $v0, $zero, .L802A9188 /* 42DA4C 802A903C A0600081 */ sb $zero, 0x81($v1) /* 42DA50 802A9040 0C09A216 */ jal func_80268858 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A91A0_42DBB0.s b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A91A0_42DBB0.s index dc3f0c6aed..e579cfb7a3 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A91A0_42DBB0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A91A0_42DBB0.s @@ -6,8 +6,8 @@ glabel func_802A91A0_42DBB0 /* 42DBB4 802A91A4 AFB20018 */ sw $s2, 0x18($sp) /* 42DBB8 802A91A8 0080902D */ daddu $s2, $a0, $zero /* 42DBBC 802A91AC AFB10014 */ sw $s1, 0x14($sp) -/* 42DBC0 802A91B0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42DBC4 802A91B4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42DBC0 802A91B0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42DBC4 802A91B4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42DBC8 802A91B8 AFB3001C */ sw $s3, 0x1c($sp) /* 42DBCC 802A91BC 3C13800E */ lui $s3, %hi(gBattleStatus) /* 42DBD0 802A91C0 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A92A0_42DCB0.s b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A92A0_42DCB0.s index 05592e978d..e7bcceba95 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A92A0_42DCB0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A92A0_42DCB0.s @@ -4,8 +4,8 @@ glabel func_802A92A0_42DCB0 /* 42DCB0 802A92A0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 42DCB4 802A92A4 AFB10014 */ sw $s1, 0x14($sp) -/* 42DCB8 802A92A8 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42DCBC 802A92AC 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42DCB8 802A92A8 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42DCBC 802A92AC 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42DCC0 802A92B0 AFBF001C */ sw $ra, 0x1c($sp) /* 42DCC4 802A92B4 AFB20018 */ sw $s2, 0x18($sp) /* 42DCC8 802A92B8 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A97F8_42E208.s b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A97F8_42E208.s index 372d4f125e..e5eb5d2c7c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A97F8_42E208.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A97F8_42E208.s @@ -4,8 +4,8 @@ glabel func_802A97F8_42E208 /* 42E208 802A97F8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 42E20C 802A97FC AFB1001C */ sw $s1, 0x1c($sp) -/* 42E210 802A9800 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42E214 802A9804 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42E210 802A9800 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42E214 802A9804 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42E218 802A9808 AFBF0020 */ sw $ra, 0x20($sp) /* 42E21C 802A980C AFB00018 */ sw $s0, 0x18($sp) /* 42E220 802A9810 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A98E0_42E2F0.s b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A98E0_42E2F0.s index 584d884c2f..27e5b71da8 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A98E0_42E2F0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/mega_shock/func_802A98E0_42E2F0.s @@ -4,8 +4,8 @@ glabel func_802A98E0_42E2F0 /* 42E2F0 802A98E0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 42E2F4 802A98E4 AFB00010 */ sw $s0, 0x10($sp) -/* 42E2F8 802A98E8 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42E2FC 802A98EC 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 42E2F8 802A98E8 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 42E2FC 802A98EC 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 42E300 802A98F0 AFBF0014 */ sw $ra, 0x14($sp) /* 42E304 802A98F4 0C05123D */ jal free_hud_element /* 42E308 802A98F8 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9000_42CF10.s b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9000_42CF10.s index 40ba33fc10..0cdbc60684 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9000_42CF10.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9000_42CF10.s @@ -14,8 +14,8 @@ glabel func_802A9000_42CF10 /* 42CF34 802A9024 244243A0 */ addiu $v0, $v0, %lo(D_802943A0) /* 42CF38 802A9028 AC620434 */ sw $v0, 0x434($v1) /* 42CF3C 802A902C 80620083 */ lb $v0, 0x83($v1) -/* 42CF40 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42CF44 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42CF40 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42CF44 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42CF48 802A9038 5040006F */ beql $v0, $zero, .L802A91F8 /* 42CF4C 802A903C A0600081 */ sb $zero, 0x81($v1) /* 42CF50 802A9040 0C09A216 */ jal func_80268858 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9210_42D120.s b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9210_42D120.s index 10648debe4..3b8bb72fee 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9210_42D120.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9210_42D120.s @@ -6,8 +6,8 @@ glabel func_802A9210_42D120 /* 42D124 802A9214 AFB20018 */ sw $s2, 0x18($sp) /* 42D128 802A9218 0080902D */ daddu $s2, $a0, $zero /* 42D12C 802A921C AFB10014 */ sw $s1, 0x14($sp) -/* 42D130 802A9220 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42D134 802A9224 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42D130 802A9220 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42D134 802A9224 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42D138 802A9228 AFB3001C */ sw $s3, 0x1c($sp) /* 42D13C 802A922C 3C13800E */ lui $s3, %hi(gBattleStatus) /* 42D140 802A9230 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s index b82439038b..e9976f7e80 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9310_42D220.s @@ -4,8 +4,8 @@ glabel func_802A9310_42D220 /* 42D220 802A9310 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 42D224 802A9314 AFB10014 */ sw $s1, 0x14($sp) -/* 42D228 802A9318 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42D22C 802A931C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42D228 802A9318 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42D22C 802A931C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42D230 802A9320 AFBF001C */ sw $ra, 0x1c($sp) /* 42D234 802A9324 AFB20018 */ sw $s2, 0x18($sp) /* 42D238 802A9328 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A98D0_42D7E0.s b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A98D0_42D7E0.s index 1b4f793caf..65032280aa 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A98D0_42D7E0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A98D0_42D7E0.s @@ -6,8 +6,8 @@ glabel func_802A98D0_42D7E0 /* 42D7E4 802A98D4 AFB40028 */ sw $s4, 0x28($sp) /* 42D7E8 802A98D8 3C1451EB */ lui $s4, 0x51eb /* 42D7EC 802A98DC AFB30024 */ sw $s3, 0x24($sp) -/* 42D7F0 802A98E0 3C13802A */ lui $s3, %hi(D_8029FBE0) -/* 42D7F4 802A98E4 2673FBE0 */ addiu $s3, $s3, %lo(D_8029FBE0) +/* 42D7F0 802A98E0 3C13802A */ lui $s3, %hi(gActionCommandStatus) +/* 42D7F4 802A98E4 2673FBE0 */ addiu $s3, $s3, %lo(gActionCommandStatus) /* 42D7F8 802A98E8 AFBF002C */ sw $ra, 0x2c($sp) /* 42D7FC 802A98EC AFB20020 */ sw $s2, 0x20($sp) /* 42D800 802A98F0 AFB1001C */ sw $s1, 0x1c($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9A54_42D964.s b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9A54_42D964.s index 1ad691bad5..3131becbc4 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9A54_42D964.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/power_shock/func_802A9A54_42D964.s @@ -4,8 +4,8 @@ glabel func_802A9A54_42D964 /* 42D964 802A9A54 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 42D968 802A9A58 AFB00010 */ sw $s0, 0x10($sp) -/* 42D96C 802A9A5C 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42D970 802A9A60 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 42D96C 802A9A5C 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 42D970 802A9A60 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 42D974 802A9A64 AFBF0014 */ sw $ra, 0x14($sp) /* 42D978 802A9A68 0C05123D */ jal free_hud_element /* 42D97C 802A9A6C 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9000_42E3A0.s b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9000_42E3A0.s index 0dbab048d8..443948ceef 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9000_42E3A0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9000_42E3A0.s @@ -14,8 +14,8 @@ glabel func_802A9000_42E3A0 /* 42E3C4 802A9024 244243E0 */ addiu $v0, $v0, %lo(D_802943E0) /* 42E3C8 802A9028 AE020434 */ sw $v0, 0x434($s0) /* 42E3CC 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 42E3D0 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42E3D4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42E3D0 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42E3D4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42E3D8 802A9038 A2020086 */ sb $v0, 0x86($s0) /* 42E3DC 802A903C 82020083 */ lb $v0, 0x83($s0) /* 42E3E0 802A9040 10400047 */ beqz $v0, .L802A9160 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A917C_42E51C.s b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A917C_42E51C.s index b107edd192..73143f7999 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A917C_42E51C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A917C_42E51C.s @@ -6,8 +6,8 @@ glabel func_802A917C_42E51C /* 42E520 802A9180 AFB3001C */ sw $s3, 0x1c($sp) /* 42E524 802A9184 0080982D */ daddu $s3, $a0, $zero /* 42E528 802A9188 AFB10014 */ sw $s1, 0x14($sp) -/* 42E52C 802A918C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42E530 802A9190 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42E52C 802A918C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42E530 802A9190 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42E534 802A9194 AFB20018 */ sw $s2, 0x18($sp) /* 42E538 802A9198 3C12800E */ lui $s2, %hi(gBattleStatus) /* 42E53C 802A919C 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9298_42E638.s b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9298_42E638.s index 72de981efb..e741543cd0 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9298_42E638.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A9298_42E638.s @@ -4,8 +4,8 @@ glabel func_802A9298_42E638 /* 42E638 802A9298 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 42E63C 802A929C AFB10014 */ sw $s1, 0x14($sp) -/* 42E640 802A92A0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42E644 802A92A4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42E640 802A92A0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42E644 802A92A4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42E648 802A92A8 AFB20018 */ sw $s2, 0x18($sp) /* 42E64C 802A92AC 3C12800E */ lui $s2, %hi(gBattleStatus) /* 42E650 802A92B0 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A98B0_42EC50.s b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A98B0_42EC50.s index 7cf05c416e..ae819617fb 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A98B0_42EC50.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/smack/func_802A98B0_42EC50.s @@ -4,8 +4,8 @@ glabel func_802A98B0_42EC50 /* 42EC50 802A98B0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 42EC54 802A98B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 42EC58 802A98B8 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42EC5C 802A98BC 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42EC58 802A98B8 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42EC5C 802A98BC 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42EC60 802A98C0 AFBF0020 */ sw $ra, 0x20($sp) /* 42EC64 802A98C4 AFB00018 */ sw $s0, 0x18($sp) /* 42EC68 802A98C8 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9000_42EE20.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9000_42EE20.s index 6b7aa5c202..7f40e0f282 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9000_42EE20.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9000_42EE20.s @@ -12,8 +12,8 @@ glabel func_802A9000_42EE20 /* 42EE3C 802A901C A2020082 */ sb $v0, 0x82($s0) /* 42EE40 802A9020 3C028029 */ lui $v0, %hi(D_80294400) /* 42EE44 802A9024 24424400 */ addiu $v0, $v0, %lo(D_80294400) -/* 42EE48 802A9028 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42EE4C 802A902C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42EE48 802A9028 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42EE4C 802A902C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42EE50 802A9030 AE020434 */ sw $v0, 0x434($s0) /* 42EE54 802A9034 82020083 */ lb $v0, 0x83($s0) /* 42EE58 802A9038 10400045 */ beqz $v0, .L802A9150 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A916C_42EF8C.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A916C_42EF8C.s index 284320cf46..ad4e90dcde 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A916C_42EF8C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A916C_42EF8C.s @@ -6,8 +6,8 @@ glabel func_802A916C_42EF8C /* 42EF90 802A9170 AFB20018 */ sw $s2, 0x18($sp) /* 42EF94 802A9174 0080902D */ daddu $s2, $a0, $zero /* 42EF98 802A9178 AFB10014 */ sw $s1, 0x14($sp) -/* 42EF9C 802A917C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42EFA0 802A9180 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42EF9C 802A917C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42EFA0 802A9180 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42EFA4 802A9184 AFB3001C */ sw $s3, 0x1c($sp) /* 42EFA8 802A9188 3C13800E */ lui $s3, %hi(gBattleStatus) /* 42EFAC 802A918C 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s index 6cc1da4e9b..b9629bc3bb 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9254_42F074.s @@ -4,8 +4,8 @@ glabel func_802A9254_42F074 /* 42F074 802A9254 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 42F078 802A9258 AFB10014 */ sw $s1, 0x14($sp) -/* 42F07C 802A925C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42F080 802A9260 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42F07C 802A925C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42F080 802A9260 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42F084 802A9264 AFBF001C */ sw $ra, 0x1c($sp) /* 42F088 802A9268 AFB20018 */ sw $s2, 0x18($sp) /* 42F08C 802A926C AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A973C_42F55C.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A973C_42F55C.s index 2021f02e45..5b59bf4a0b 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A973C_42F55C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A973C_42F55C.s @@ -4,8 +4,8 @@ glabel func_802A973C_42F55C /* 42F55C 802A973C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 42F560 802A9740 AFB1001C */ sw $s1, 0x1c($sp) -/* 42F564 802A9744 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42F568 802A9748 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42F564 802A9744 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42F568 802A9748 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42F56C 802A974C AFBF0020 */ sw $ra, 0x20($sp) /* 42F570 802A9750 AFB00018 */ sw $s0, 0x18($sp) /* 42F574 802A9754 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9000_430020.s b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9000_430020.s index 5c766b9bfa..1631cde780 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9000_430020.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9000_430020.s @@ -14,8 +14,8 @@ glabel func_802A9000_430020 /* 430044 802A9024 24424440 */ addiu $v0, $v0, %lo(D_80294440) /* 430048 802A9028 AE020434 */ sw $v0, 0x434($s0) /* 43004C 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 430050 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 430054 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 430050 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 430054 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 430058 802A9038 A2020086 */ sb $v0, 0x86($s0) /* 43005C 802A903C 82020083 */ lb $v0, 0x83($s0) /* 430060 802A9040 10400047 */ beqz $v0, .L802A9160 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A917C_43019C.s b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A917C_43019C.s index 59ba6cb75c..59f3807105 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A917C_43019C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A917C_43019C.s @@ -6,8 +6,8 @@ glabel func_802A917C_43019C /* 4301A0 802A9180 AFB3001C */ sw $s3, 0x1c($sp) /* 4301A4 802A9184 0080982D */ daddu $s3, $a0, $zero /* 4301A8 802A9188 AFB10014 */ sw $s1, 0x14($sp) -/* 4301AC 802A918C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4301B0 802A9190 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4301AC 802A918C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4301B0 802A9190 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4301B4 802A9194 AFB20018 */ sw $s2, 0x18($sp) /* 4301B8 802A9198 3C12800E */ lui $s2, %hi(gBattleStatus) /* 4301BC 802A919C 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s index 9817b606f4..abcc30df41 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A9298_4302B8.s @@ -4,8 +4,8 @@ glabel func_802A9298_4302B8 /* 4302B8 802A9298 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 4302BC 802A929C AFB10014 */ sw $s1, 0x14($sp) -/* 4302C0 802A92A0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4302C4 802A92A4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4302C0 802A92A0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4302C4 802A92A4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4302C8 802A92A8 AFBF001C */ sw $ra, 0x1c($sp) /* 4302CC 802A92AC AFB20018 */ sw $s2, 0x18($sp) /* 4302D0 802A92B0 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A97FC_43081C.s b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A97FC_43081C.s index b614ad63ab..01b84fe89c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A97FC_43081C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/spook/func_802A97FC_43081C.s @@ -4,8 +4,8 @@ glabel func_802A97FC_43081C /* 43081C 802A97FC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 430820 802A9800 AFB1001C */ sw $s1, 0x1c($sp) -/* 430824 802A9804 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 430828 802A9808 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 430824 802A9804 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 430828 802A9808 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 43082C 802A980C AFBF0020 */ sw $ra, 0x20($sp) /* 430830 802A9810 AFB00018 */ sw $s0, 0x18($sp) /* 430834 802A9814 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9000_429D20.s b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9000_429D20.s index 3b82227c98..7918edc34c 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9000_429D20.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9000_429D20.s @@ -12,8 +12,8 @@ glabel func_802A9000_429D20 /* 429D3C 802A901C A2020082 */ sb $v0, 0x82($s0) /* 429D40 802A9020 3C028029 */ lui $v0, %hi(D_80294380) /* 429D44 802A9024 24424380 */ addiu $v0, $v0, %lo(D_80294380) -/* 429D48 802A9028 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 429D4C 802A902C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 429D48 802A9028 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 429D4C 802A902C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 429D50 802A9030 AE020434 */ sw $v0, 0x434($s0) /* 429D54 802A9034 82020083 */ lb $v0, 0x83($s0) /* 429D58 802A9038 10400031 */ beqz $v0, .L802A9100 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A911C_429E3C.s b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A911C_429E3C.s index 05abc6ad97..150046e038 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A911C_429E3C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A911C_429E3C.s @@ -6,8 +6,8 @@ glabel func_802A911C_429E3C /* 429E40 802A9120 AFB20018 */ sw $s2, 0x18($sp) /* 429E44 802A9124 0080902D */ daddu $s2, $a0, $zero /* 429E48 802A9128 AFB10014 */ sw $s1, 0x14($sp) -/* 429E4C 802A912C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 429E50 802A9130 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 429E4C 802A912C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 429E50 802A9130 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 429E54 802A9134 AFB3001C */ sw $s3, 0x1c($sp) /* 429E58 802A9138 3C13800E */ lui $s3, %hi(gBattleStatus) /* 429E5C 802A913C 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s index 621a285ca9..c0cca9633e 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9208_429F28.s @@ -4,8 +4,8 @@ glabel func_802A9208_429F28 /* 429F28 802A9208 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 429F2C 802A920C AFB10014 */ sw $s1, 0x14($sp) -/* 429F30 802A9210 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 429F34 802A9214 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 429F30 802A9210 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 429F34 802A9214 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 429F38 802A9218 AFBF0020 */ sw $ra, 0x20($sp) /* 429F3C 802A921C AFB3001C */ sw $s3, 0x1c($sp) /* 429F40 802A9220 AFB20018 */ sw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9634_42A354.s b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9634_42A354.s index cfc3c1428a..c4212afe8a 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9634_42A354.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9634_42A354.s @@ -4,8 +4,8 @@ glabel func_802A9634_42A354 /* 42A354 802A9634 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 42A358 802A9638 AFB10024 */ sw $s1, 0x24($sp) -/* 42A35C 802A963C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42A360 802A9640 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42A35C 802A963C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42A360 802A9640 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42A364 802A9644 AFBF0028 */ sw $ra, 0x28($sp) /* 42A368 802A9648 AFB00020 */ sw $s0, 0x20($sp) /* 42A36C 802A964C 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9720_42A440.s b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9720_42A440.s index fb3cf1a93c..190a0b4e71 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9720_42A440.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/squirt/func_802A9720_42A440.s @@ -8,8 +8,8 @@ glabel func_802A9720_42A440 /* 42A44C 802A972C AFBF0014 */ sw $ra, 0x14($sp) /* 42A450 802A9730 0C05271B */ jal sfx_stop_sound /* 42A454 802A9734 AFB00010 */ sw $s0, 0x10($sp) -/* 42A458 802A9738 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42A45C 802A973C 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 42A458 802A9738 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 42A45C 802A973C 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 42A460 802A9740 0C05123D */ jal free_hud_element /* 42A464 802A9744 8E040004 */ lw $a0, 4($s0) /* 42A468 802A9748 0C05123D */ jal free_hud_element diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9000_425590.s b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9000_425590.s index 3cf089cd06..cffacd3a0f 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9000_425590.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9000_425590.s @@ -14,8 +14,8 @@ glabel func_802A9000_425590 /* 4255B4 802A9024 24424260 */ addiu $v0, $v0, %lo(D_80294260) /* 4255B8 802A9028 AC620434 */ sw $v0, 0x434($v1) /* 4255BC 802A902C 80620083 */ lb $v0, 0x83($v1) -/* 4255C0 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4255C4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4255C0 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4255C4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4255C8 802A9038 5040002F */ beql $v0, $zero, .L802A90F8 /* 4255CC 802A903C A0600081 */ sb $zero, 0x81($v1) /* 4255D0 802A9040 0C09A216 */ jal func_80268858 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9110_4256A0.s b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9110_4256A0.s index 50924eeb40..4d3c2f55c9 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9110_4256A0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9110_4256A0.s @@ -6,8 +6,8 @@ glabel func_802A9110_4256A0 /* 4256A4 802A9114 AFB20018 */ sw $s2, 0x18($sp) /* 4256A8 802A9118 0080902D */ daddu $s2, $a0, $zero /* 4256AC 802A911C AFB10014 */ sw $s1, 0x14($sp) -/* 4256B0 802A9120 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 4256B4 802A9124 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 4256B0 802A9120 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 4256B4 802A9124 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 4256B8 802A9128 AFB3001C */ sw $s3, 0x1c($sp) /* 4256BC 802A912C 3C13800E */ lui $s3, %hi(gBattleStatus) /* 4256C0 802A9130 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A91F8_425788.s b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A91F8_425788.s index 3ceb5810fe..9017aec268 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A91F8_425788.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A91F8_425788.s @@ -4,8 +4,8 @@ glabel func_802A91F8_425788 /* 425788 802A91F8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 42578C 802A91FC AFB10014 */ sw $s1, 0x14($sp) -/* 425790 802A9200 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 425794 802A9204 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 425790 802A9200 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 425794 802A9204 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 425798 802A9208 AFBF0018 */ sw $ra, 0x18($sp) /* 42579C 802A920C AFB00010 */ sw $s0, 0x10($sp) /* 4257A0 802A9210 8623004C */ lh $v1, 0x4c($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A94A4_425A34.s b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A94A4_425A34.s index eab10ca04a..215146ebdf 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A94A4_425A34.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A94A4_425A34.s @@ -3,8 +3,8 @@ glabel func_802A94A4_425A34 /* 425A34 802A94A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 425A38 802A94A8 3C03802A */ lui $v1, %hi(D_8029FBE0) -/* 425A3C 802A94AC 2463FBE0 */ addiu $v1, $v1, %lo(D_8029FBE0) +/* 425A38 802A94A8 3C03802A */ lui $v1, %hi(gActionCommandStatus) +/* 425A3C 802A94AC 2463FBE0 */ addiu $v1, $v1, %lo(gActionCommandStatus) /* 425A40 802A94B0 AFBF0020 */ sw $ra, 0x20($sp) /* 425A44 802A94B4 AFB1001C */ sw $s1, 0x1c($sp) /* 425A48 802A94B8 AFB00018 */ sw $s0, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9544_425AD4.s b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9544_425AD4.s index 0e19d269c2..2e98e865c5 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9544_425AD4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/stop_leech/func_802A9544_425AD4.s @@ -4,8 +4,8 @@ glabel func_802A9544_425AD4 /* 425AD4 802A9544 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 425AD8 802A9548 AFB00010 */ sw $s0, 0x10($sp) -/* 425ADC 802A954C 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 425AE0 802A9550 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 425ADC 802A954C 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 425AE0 802A9550 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 425AE4 802A9554 AFBF0014 */ sw $ra, 0x14($sp) /* 425AE8 802A9558 0C05123D */ jal free_hud_element /* 425AEC 802A955C 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9000_42C6F0.s b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9000_42C6F0.s index 6e68693588..603bd4a2b1 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9000_42C6F0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9000_42C6F0.s @@ -14,8 +14,8 @@ glabel func_802A9000_42C6F0 /* 42C714 802A9024 A0620082 */ sb $v0, 0x82($v1) /* 42C718 802A9028 3C028029 */ lui $v0, %hi(D_802944A0) /* 42C71C 802A902C 244244A0 */ addiu $v0, $v0, %lo(D_802944A0) -/* 42C720 802A9030 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42C724 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42C720 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42C724 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42C728 802A9038 AC620434 */ sw $v0, 0x434($v1) /* 42C72C 802A903C 80620083 */ lb $v0, 0x83($v1) /* 42C730 802A9040 14400003 */ bnez $v0, .L802A9050 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9138_42C828.s b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9138_42C828.s index a69315a95d..4939f464ee 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9138_42C828.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9138_42C828.s @@ -6,8 +6,8 @@ glabel func_802A9138_42C828 /* 42C82C 802A913C AFB3001C */ sw $s3, 0x1c($sp) /* 42C830 802A9140 0080982D */ daddu $s3, $a0, $zero /* 42C834 802A9144 AFB10014 */ sw $s1, 0x14($sp) -/* 42C838 802A9148 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42C83C 802A914C 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42C838 802A9148 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42C83C 802A914C 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42C840 802A9150 AFB20018 */ sw $s2, 0x18($sp) /* 42C844 802A9154 3C12800E */ lui $s2, %hi(gBattleStatus) /* 42C848 802A9158 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9228_42C918.s b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9228_42C918.s index 2328aecf47..33c622bae6 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9228_42C918.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9228_42C918.s @@ -4,8 +4,8 @@ glabel func_802A9228_42C918 /* 42C918 802A9228 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 42C91C 802A922C AFB10014 */ sw $s1, 0x14($sp) -/* 42C920 802A9230 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42C924 802A9234 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42C920 802A9230 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42C924 802A9234 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42C928 802A9238 AFBF0034 */ sw $ra, 0x34($sp) /* 42C92C 802A923C AFBE0030 */ sw $fp, 0x30($sp) /* 42C930 802A9240 AFB7002C */ sw $s7, 0x2c($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9764_42CE54.s b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9764_42CE54.s index 7896b9187b..7611a87495 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9764_42CE54.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/tidal_wave/func_802A9764_42CE54.s @@ -3,8 +3,8 @@ glabel func_802A9764_42CE54 /* 42CE54 802A9764 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 42CE58 802A9768 3C02802A */ lui $v0, %hi(D_8029FBE0) -/* 42CE5C 802A976C 2442FBE0 */ addiu $v0, $v0, %lo(D_8029FBE0) +/* 42CE58 802A9768 3C02802A */ lui $v0, %hi(gActionCommandStatus) +/* 42CE5C 802A976C 2442FBE0 */ addiu $v0, $v0, %lo(gActionCommandStatus) /* 42CE60 802A9770 AFB10014 */ sw $s1, 0x14($sp) /* 42CE64 802A9774 24110001 */ addiu $s1, $zero, 1 /* 42CE68 802A9778 AFBF0018 */ sw $ra, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s index 452052ae24..903414383e 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9000_42A4F0.s @@ -16,8 +16,8 @@ glabel func_802A9000_42A4F0 /* 42A51C 802A902C A0620082 */ sb $v0, 0x82($v1) /* 42A520 802A9030 3C028029 */ lui $v0, %hi(D_80294460) /* 42A524 802A9034 24424460 */ addiu $v0, $v0, %lo(D_80294460) -/* 42A528 802A9038 3C12802A */ lui $s2, %hi(D_8029FBE0) -/* 42A52C 802A903C 2652FBE0 */ addiu $s2, $s2, %lo(D_8029FBE0) +/* 42A528 802A9038 3C12802A */ lui $s2, %hi(gActionCommandStatus) +/* 42A52C 802A903C 2652FBE0 */ addiu $s2, $s2, %lo(gActionCommandStatus) /* 42A530 802A9040 AC620434 */ sw $v0, 0x434($v1) /* 42A534 802A9044 80620083 */ lb $v0, 0x83($v1) /* 42A538 802A9048 14400003 */ bnez $v0, .L802A9058 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9398_42A888.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9398_42A888.s index add195d852..6d6a43c687 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9398_42A888.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A9398_42A888.s @@ -6,8 +6,8 @@ glabel func_802A9398_42A888 /* 42A88C 802A939C AFB3001C */ sw $s3, 0x1c($sp) /* 42A890 802A93A0 0080982D */ daddu $s3, $a0, $zero /* 42A894 802A93A4 AFB10014 */ sw $s1, 0x14($sp) -/* 42A898 802A93A8 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42A89C 802A93AC 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42A898 802A93A8 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42A89C 802A93AC 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42A8A0 802A93B0 AFB20018 */ sw $s2, 0x18($sp) /* 42A8A4 802A93B4 3C12800E */ lui $s2, %hi(gBattleStatus) /* 42A8A8 802A93B8 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s index 2cb46db5f4..c11492fca4 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802A948C_42A97C.s @@ -4,8 +4,8 @@ glabel func_802A948C_42A97C /* 42A97C 802A948C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 42A980 802A9490 AFB10014 */ sw $s1, 0x14($sp) -/* 42A984 802A9494 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 42A988 802A9498 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 42A984 802A9494 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 42A988 802A9498 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 42A98C 802A949C AFBF0018 */ sw $ra, 0x18($sp) /* 42A990 802A94A0 AFB00010 */ sw $s0, 0x10($sp) /* 42A994 802A94A4 8623004C */ lh $v1, 0x4c($s1) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802AA014_42B504.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802AA014_42B504.s index f768bb1c07..e2562c54fa 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802AA014_42B504.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802AA014_42B504.s @@ -4,8 +4,8 @@ glabel func_802AA014_42B504 /* 42B504 802AA014 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 42B508 802AA018 AFB00010 */ sw $s0, 0x10($sp) -/* 42B50C 802AA01C 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42B510 802AA020 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 42B50C 802AA01C 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 42B510 802AA020 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 42B514 802AA024 AFBF0018 */ sw $ra, 0x18($sp) /* 42B518 802AA028 AFB10014 */ sw $s1, 0x14($sp) /* 42B51C 802AA02C 0C0511EA */ jal draw_hud_element_clipped diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802AA0D8_42B5C8.s b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802AA0D8_42B5C8.s index 07b320c8ae..ed8acb2b87 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802AA0D8_42B5C8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/water_block/func_802AA0D8_42B5C8.s @@ -4,8 +4,8 @@ glabel func_802AA0D8_42B5C8 /* 42B5C8 802AA0D8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 42B5CC 802AA0DC AFB00010 */ sw $s0, 0x10($sp) -/* 42B5D0 802AA0E0 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 42B5D4 802AA0E4 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 42B5D0 802AA0E0 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 42B5D4 802AA0E4 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 42B5D8 802AA0E8 AFBF0014 */ sw $ra, 0x14($sp) /* 42B5DC 802AA0EC 0C05123D */ jal free_hud_element /* 42B5E0 802AA0F0 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s index 3c9402ebec..b1b1e904b1 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9000_423C70.s @@ -17,8 +17,8 @@ glabel func_802A9000_423C70 /* 423CA0 802A9030 A2020082 */ sb $v0, 0x82($s0) /* 423CA4 802A9034 3C028029 */ lui $v0, %hi(D_80294240) /* 423CA8 802A9038 24424240 */ addiu $v0, $v0, %lo(D_80294240) -/* 423CAC 802A903C 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 423CB0 802A9040 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 423CAC 802A903C 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 423CB0 802A9040 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 423CB4 802A9044 AE020434 */ sw $v0, 0x434($s0) /* 423CB8 802A9048 82020083 */ lb $v0, 0x83($s0) /* 423CBC 802A904C 14400003 */ bnez $v0, .L802A905C diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A91E0_423E50.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A91E0_423E50.s index b7d4c94f6d..54db81210f 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A91E0_423E50.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A91E0_423E50.s @@ -6,8 +6,8 @@ glabel func_802A91E0_423E50 /* 423E54 802A91E4 AFB20018 */ sw $s2, 0x18($sp) /* 423E58 802A91E8 0080902D */ daddu $s2, $a0, $zero /* 423E5C 802A91EC AFB10014 */ sw $s1, 0x14($sp) -/* 423E60 802A91F0 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 423E64 802A91F4 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 423E60 802A91F0 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 423E64 802A91F4 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 423E68 802A91F8 AFB3001C */ sw $s3, 0x1c($sp) /* 423E6C 802A91FC 3C13800E */ lui $s3, %hi(gBattleStatus) /* 423E70 802A9200 2673C070 */ addiu $s3, $s3, %lo(gBattleStatus) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s index 33c7b66f5c..669e8f5f07 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A92F0_423F60.s @@ -4,8 +4,8 @@ glabel func_802A92F0_423F60 /* 423F60 802A92F0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 423F64 802A92F4 AFB10014 */ sw $s1, 0x14($sp) -/* 423F68 802A92F8 3C11802A */ lui $s1, %hi(D_8029FBE0) -/* 423F6C 802A92FC 2631FBE0 */ addiu $s1, $s1, %lo(D_8029FBE0) +/* 423F68 802A92F8 3C11802A */ lui $s1, %hi(gActionCommandStatus) +/* 423F6C 802A92FC 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) /* 423F70 802A9300 AFBF001C */ sw $ra, 0x1c($sp) /* 423F74 802A9304 AFB20018 */ sw $s2, 0x18($sp) /* 423F78 802A9308 AFB00010 */ sw $s0, 0x10($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9744_4243B4.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9744_4243B4.s index 82fe7861bd..e7cd99947f 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9744_4243B4.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9744_4243B4.s @@ -3,8 +3,8 @@ glabel func_802A9744_4243B4 /* 4243B4 802A9744 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 4243B8 802A9748 3C03802A */ lui $v1, %hi(D_8029FBE0) -/* 4243BC 802A974C 2463FBE0 */ addiu $v1, $v1, %lo(D_8029FBE0) +/* 4243B8 802A9748 3C03802A */ lui $v1, %hi(gActionCommandStatus) +/* 4243BC 802A974C 2463FBE0 */ addiu $v1, $v1, %lo(gActionCommandStatus) /* 4243C0 802A9750 AFB00018 */ sw $s0, 0x18($sp) /* 4243C4 802A9754 0060802D */ daddu $s0, $v1, $zero /* 4243C8 802A9758 AFB30024 */ sw $s3, 0x24($sp) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9898_424508.s b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9898_424508.s index df42c1fe11..e592e85df7 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9898_424508.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/whirlwind/func_802A9898_424508.s @@ -4,8 +4,8 @@ glabel func_802A9898_424508 /* 424508 802A9898 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 42450C 802A989C AFB00010 */ sw $s0, 0x10($sp) -/* 424510 802A98A0 3C10802A */ lui $s0, %hi(D_8029FBE0) -/* 424514 802A98A4 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) +/* 424510 802A98A0 3C10802A */ lui $s0, %hi(gActionCommandStatus) +/* 424514 802A98A4 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) /* 424518 802A98A8 AFBF0014 */ sw $ra, 0x14($sp) /* 42451C 802A98AC 0C05123D */ jal free_hud_element /* 424520 802A98B0 8E040004 */ lw $a0, 4($s0) diff --git a/ver/us/asm/nonmatchings/battle/area_flo/5B14B0/func_802180CC_5B157C.s b/ver/us/asm/nonmatchings/battle/area_flo/5B14B0/func_802180CC_5B157C.s deleted file mode 100644 index afdda3a326..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_flo/5B14B0/func_802180CC_5B157C.s +++ /dev/null @@ -1,77 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802180CC_5B157C -/* 5B157C 802180CC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 5B1580 802180D0 AFB10014 */ sw $s1, 0x14($sp) -/* 5B1584 802180D4 0080882D */ daddu $s1, $a0, $zero -/* 5B1588 802180D8 AFBF0024 */ sw $ra, 0x24($sp) -/* 5B158C 802180DC AFB40020 */ sw $s4, 0x20($sp) -/* 5B1590 802180E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B1594 802180E4 AFB20018 */ sw $s2, 0x18($sp) -/* 5B1598 802180E8 AFB00010 */ sw $s0, 0x10($sp) -/* 5B159C 802180EC F7B60030 */ sdc1 $f22, 0x30($sp) -/* 5B15A0 802180F0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 5B15A4 802180F4 8E30000C */ lw $s0, 0xc($s1) -/* 5B15A8 802180F8 8E050000 */ lw $a1, ($s0) -/* 5B15AC 802180FC 0C0B1EAF */ jal get_variable -/* 5B15B0 80218100 26100004 */ addiu $s0, $s0, 4 -/* 5B15B4 80218104 8E050000 */ lw $a1, ($s0) -/* 5B15B8 80218108 26100004 */ addiu $s0, $s0, 4 -/* 5B15BC 8021810C 0220202D */ daddu $a0, $s1, $zero -/* 5B15C0 80218110 0C0B1EAF */ jal get_variable -/* 5B15C4 80218114 0040982D */ daddu $s3, $v0, $zero -/* 5B15C8 80218118 8E050000 */ lw $a1, ($s0) -/* 5B15CC 8021811C 26100004 */ addiu $s0, $s0, 4 -/* 5B15D0 80218120 0220202D */ daddu $a0, $s1, $zero -/* 5B15D4 80218124 0C0B1EAF */ jal get_variable -/* 5B15D8 80218128 0040A02D */ daddu $s4, $v0, $zero -/* 5B15DC 8021812C 0220202D */ daddu $a0, $s1, $zero -/* 5B15E0 80218130 8E050000 */ lw $a1, ($s0) -/* 5B15E4 80218134 0C0B1EAF */ jal get_variable -/* 5B15E8 80218138 0040902D */ daddu $s2, $v0, $zero -/* 5B15EC 8021813C 4482A000 */ mtc1 $v0, $f20 -/* 5B15F0 80218140 00000000 */ nop -/* 5B15F4 80218144 4680A520 */ cvt.s.w $f20, $f20 -/* 5B15F8 80218148 0C00A8D4 */ jal cos_deg -/* 5B15FC 8021814C 4600A306 */ mov.s $f12, $f20 -/* 5B1600 80218150 4492B000 */ mtc1 $s2, $f22 -/* 5B1604 80218154 00000000 */ nop -/* 5B1608 80218158 4680B5A0 */ cvt.s.w $f22, $f22 -/* 5B160C 8021815C 4600B002 */ mul.s $f0, $f22, $f0 -/* 5B1610 80218160 00000000 */ nop -/* 5B1614 80218164 4600A306 */ mov.s $f12, $f20 -/* 5B1618 80218168 4493A000 */ mtc1 $s3, $f20 -/* 5B161C 8021816C 00000000 */ nop -/* 5B1620 80218170 4680A520 */ cvt.s.w $f20, $f20 -/* 5B1624 80218174 4600A500 */ add.s $f20, $f20, $f0 -/* 5B1628 80218178 0C00A8BB */ jal sin_deg -/* 5B162C 8021817C 26100004 */ addiu $s0, $s0, 4 -/* 5B1630 80218180 4600B582 */ mul.s $f22, $f22, $f0 -/* 5B1634 80218184 00000000 */ nop -/* 5B1638 80218188 8E050000 */ lw $a1, ($s0) -/* 5B163C 8021818C 26100004 */ addiu $s0, $s0, 4 -/* 5B1640 80218190 0220202D */ daddu $a0, $s1, $zero -/* 5B1644 80218194 4406A000 */ mfc1 $a2, $f20 -/* 5B1648 80218198 4494A000 */ mtc1 $s4, $f20 -/* 5B164C 8021819C 00000000 */ nop -/* 5B1650 802181A0 4680A520 */ cvt.s.w $f20, $f20 -/* 5B1654 802181A4 0C0B2190 */ jal set_float_variable -/* 5B1658 802181A8 4616A501 */ sub.s $f20, $f20, $f22 -/* 5B165C 802181AC 8E050000 */ lw $a1, ($s0) -/* 5B1660 802181B0 4406A000 */ mfc1 $a2, $f20 -/* 5B1664 802181B4 0C0B2190 */ jal set_float_variable -/* 5B1668 802181B8 0220202D */ daddu $a0, $s1, $zero -/* 5B166C 802181BC 8FBF0024 */ lw $ra, 0x24($sp) -/* 5B1670 802181C0 8FB40020 */ lw $s4, 0x20($sp) -/* 5B1674 802181C4 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B1678 802181C8 8FB20018 */ lw $s2, 0x18($sp) -/* 5B167C 802181CC 8FB10014 */ lw $s1, 0x14($sp) -/* 5B1680 802181D0 8FB00010 */ lw $s0, 0x10($sp) -/* 5B1684 802181D4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 5B1688 802181D8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 5B168C 802181DC 24020002 */ addiu $v0, $zero, 2 -/* 5B1690 802181E0 03E00008 */ jr $ra -/* 5B1694 802181E4 27BD0038 */ addiu $sp, $sp, 0x38 -/* 5B1698 802181E8 00000000 */ nop -/* 5B169C 802181EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_flo/5B16A0/func_8021844C_5B18FC.s b/ver/us/asm/nonmatchings/battle/area_flo/5B16A0/func_8021844C_5B18FC.s deleted file mode 100644 index a2e9deb020..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_flo/5B16A0/func_8021844C_5B18FC.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8021844C_5B18FC -/* 5B18FC 8021844C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 5B1900 80218450 AFB10014 */ sw $s1, 0x14($sp) -/* 5B1904 80218454 0080882D */ daddu $s1, $a0, $zero -/* 5B1908 80218458 AFBF0024 */ sw $ra, 0x24($sp) -/* 5B190C 8021845C AFB40020 */ sw $s4, 0x20($sp) -/* 5B1910 80218460 AFB3001C */ sw $s3, 0x1c($sp) -/* 5B1914 80218464 AFB20018 */ sw $s2, 0x18($sp) -/* 5B1918 80218468 AFB00010 */ sw $s0, 0x10($sp) -/* 5B191C 8021846C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 5B1920 80218470 8E30000C */ lw $s0, 0xc($s1) -/* 5B1924 80218474 8E050000 */ lw $a1, ($s0) -/* 5B1928 80218478 0C0B1EAF */ jal get_variable -/* 5B192C 8021847C 26100004 */ addiu $s0, $s0, 4 -/* 5B1930 80218480 8E140000 */ lw $s4, ($s0) -/* 5B1934 80218484 26100004 */ addiu $s0, $s0, 4 -/* 5B1938 80218488 8E050000 */ lw $a1, ($s0) -/* 5B193C 8021848C 26100004 */ addiu $s0, $s0, 4 -/* 5B1940 80218490 0220202D */ daddu $a0, $s1, $zero -/* 5B1944 80218494 0C0B1EAF */ jal get_variable -/* 5B1948 80218498 0040902D */ daddu $s2, $v0, $zero -/* 5B194C 8021849C 8E050000 */ lw $a1, ($s0) -/* 5B1950 802184A0 26100004 */ addiu $s0, $s0, 4 -/* 5B1954 802184A4 0220202D */ daddu $a0, $s1, $zero -/* 5B1958 802184A8 0C0B1EAF */ jal get_variable -/* 5B195C 802184AC 0040982D */ daddu $s3, $v0, $zero -/* 5B1960 802184B0 0220202D */ daddu $a0, $s1, $zero -/* 5B1964 802184B4 8E050000 */ lw $a1, ($s0) -/* 5B1968 802184B8 0C0B210B */ jal get_float_variable -/* 5B196C 802184BC 0040802D */ daddu $s0, $v0, $zero -/* 5B1970 802184C0 3C0140C9 */ lui $at, 0x40c9 -/* 5B1974 802184C4 34210FD8 */ ori $at, $at, 0xfd8 -/* 5B1978 802184C8 44814000 */ mtc1 $at, $f8 -/* 5B197C 802184CC 44922000 */ mtc1 $s2, $f4 -/* 5B1980 802184D0 00000000 */ nop -/* 5B1984 802184D4 46802120 */ cvt.s.w $f4, $f4 -/* 5B1988 802184D8 46082202 */ mul.s $f8, $f4, $f8 -/* 5B198C 802184DC 00000000 */ nop -/* 5B1990 802184E0 44903000 */ mtc1 $s0, $f6 -/* 5B1994 802184E4 00000000 */ nop -/* 5B1998 802184E8 468031A0 */ cvt.s.w $f6, $f6 -/* 5B199C 802184EC 3C013F80 */ lui $at, 0x3f80 -/* 5B19A0 802184F0 44811000 */ mtc1 $at, $f2 -/* 5B19A4 802184F4 46062103 */ div.s $f4, $f4, $f6 -/* 5B19A8 802184F8 46041081 */ sub.s $f2, $f2, $f4 -/* 5B19AC 802184FC 46020502 */ mul.s $f20, $f0, $f2 -/* 5B19B0 80218500 00000000 */ nop -/* 5B19B4 80218504 44936000 */ mtc1 $s3, $f12 -/* 5B19B8 80218508 00000000 */ nop -/* 5B19BC 8021850C 46806320 */ cvt.s.w $f12, $f12 -/* 5B19C0 80218510 0C00A874 */ jal cos_rad -/* 5B19C4 80218514 460C4303 */ div.s $f12, $f8, $f12 -/* 5B19C8 80218518 4600A502 */ mul.s $f20, $f20, $f0 -/* 5B19CC 8021851C 00000000 */ nop -/* 5B19D0 80218520 0220202D */ daddu $a0, $s1, $zero -/* 5B19D4 80218524 4600A28D */ trunc.w.s $f10, $f20 -/* 5B19D8 80218528 44065000 */ mfc1 $a2, $f10 -/* 5B19DC 8021852C 0C0B2026 */ jal set_variable -/* 5B19E0 80218530 0280282D */ daddu $a1, $s4, $zero -/* 5B19E4 80218534 8FBF0024 */ lw $ra, 0x24($sp) -/* 5B19E8 80218538 8FB40020 */ lw $s4, 0x20($sp) -/* 5B19EC 8021853C 8FB3001C */ lw $s3, 0x1c($sp) -/* 5B19F0 80218540 8FB20018 */ lw $s2, 0x18($sp) -/* 5B19F4 80218544 8FB10014 */ lw $s1, 0x14($sp) -/* 5B19F8 80218548 8FB00010 */ lw $s0, 0x10($sp) -/* 5B19FC 8021854C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 5B1A00 80218550 24020002 */ addiu $v0, $zero, 2 -/* 5B1A04 80218554 03E00008 */ jr $ra -/* 5B1A08 80218558 27BD0030 */ addiu $sp, $sp, 0x30 -/* 5B1A0C 8021855C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_iwa/4D01F0/func_80218000_4D01F0.s b/ver/us/asm/nonmatchings/battle/area_iwa/4D01F0/func_80218000_4D01F0.s deleted file mode 100644 index e3fc646753..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_iwa/4D01F0/func_80218000_4D01F0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_4D01F0 -/* 4D01F0 80218000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 4D01F4 80218004 AFB00010 */ sw $s0, 0x10($sp) -/* 4D01F8 80218008 0080802D */ daddu $s0, $a0, $zero -/* 4D01FC 8021800C AFBF0014 */ sw $ra, 0x14($sp) -/* 4D0200 80218010 8E02000C */ lw $v0, 0xc($s0) -/* 4D0204 80218014 0C0B1EAF */ jal get_variable -/* 4D0208 80218018 8C450000 */ lw $a1, ($v0) -/* 4D020C 8021801C 8E040148 */ lw $a0, 0x148($s0) -/* 4D0210 80218020 0C09A75B */ jal get_actor -/* 4D0214 80218024 0040802D */ daddu $s0, $v0, $zero -/* 4D0218 80218028 16000005 */ bnez $s0, .L80218040 -/* 4D021C 8021802C 00000000 */ nop -/* 4D0220 80218030 8C430008 */ lw $v1, 8($v0) -/* 4D0224 80218034 24020004 */ addiu $v0, $zero, 4 -/* 4D0228 80218038 08086012 */ j .L80218048 -/* 4D022C 8021803C A062001D */ sb $v0, 0x1d($v1) -.L80218040: -/* 4D0230 80218040 8C420008 */ lw $v0, 8($v0) -/* 4D0234 80218044 A040001D */ sb $zero, 0x1d($v0) -.L80218048: -/* 4D0238 80218048 8FBF0014 */ lw $ra, 0x14($sp) -/* 4D023C 8021804C 8FB00010 */ lw $s0, 0x10($sp) -/* 4D0240 80218050 24020002 */ addiu $v0, $zero, 2 -/* 4D0244 80218054 03E00008 */ jr $ra -/* 4D0248 80218058 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_jan/573C30/func_802183DC_573CFC.s b/ver/us/asm/nonmatchings/battle/area_jan/573C30/func_802183DC_573CFC.s deleted file mode 100644 index 9616a91586..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_jan/573C30/func_802183DC_573CFC.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802183DC_573CFC -/* 573CFC 802183DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 573D00 802183E0 AFB10014 */ sw $s1, 0x14($sp) -/* 573D04 802183E4 0080882D */ daddu $s1, $a0, $zero -/* 573D08 802183E8 AFBF0024 */ sw $ra, 0x24($sp) -/* 573D0C 802183EC AFB40020 */ sw $s4, 0x20($sp) -/* 573D10 802183F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 573D14 802183F4 AFB20018 */ sw $s2, 0x18($sp) -/* 573D18 802183F8 AFB00010 */ sw $s0, 0x10($sp) -/* 573D1C 802183FC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 573D20 80218400 8E30000C */ lw $s0, 0xc($s1) -/* 573D24 80218404 8E050000 */ lw $a1, ($s0) -/* 573D28 80218408 0C0B1EAF */ jal get_variable -/* 573D2C 8021840C 26100004 */ addiu $s0, $s0, 4 -/* 573D30 80218410 8E140000 */ lw $s4, ($s0) -/* 573D34 80218414 26100004 */ addiu $s0, $s0, 4 -/* 573D38 80218418 8E050000 */ lw $a1, ($s0) -/* 573D3C 8021841C 26100004 */ addiu $s0, $s0, 4 -/* 573D40 80218420 0220202D */ daddu $a0, $s1, $zero -/* 573D44 80218424 0C0B1EAF */ jal get_variable -/* 573D48 80218428 0040902D */ daddu $s2, $v0, $zero -/* 573D4C 8021842C 8E050000 */ lw $a1, ($s0) -/* 573D50 80218430 26100004 */ addiu $s0, $s0, 4 -/* 573D54 80218434 0220202D */ daddu $a0, $s1, $zero -/* 573D58 80218438 0C0B1EAF */ jal get_variable -/* 573D5C 8021843C 0040982D */ daddu $s3, $v0, $zero -/* 573D60 80218440 0220202D */ daddu $a0, $s1, $zero -/* 573D64 80218444 8E050000 */ lw $a1, ($s0) -/* 573D68 80218448 0C0B210B */ jal get_float_variable -/* 573D6C 8021844C 0040802D */ daddu $s0, $v0, $zero -/* 573D70 80218450 3C0140C9 */ lui $at, 0x40c9 -/* 573D74 80218454 34210FD8 */ ori $at, $at, 0xfd8 -/* 573D78 80218458 44814000 */ mtc1 $at, $f8 -/* 573D7C 8021845C 44922000 */ mtc1 $s2, $f4 -/* 573D80 80218460 00000000 */ nop -/* 573D84 80218464 46802120 */ cvt.s.w $f4, $f4 -/* 573D88 80218468 46082202 */ mul.s $f8, $f4, $f8 -/* 573D8C 8021846C 00000000 */ nop -/* 573D90 80218470 44903000 */ mtc1 $s0, $f6 -/* 573D94 80218474 00000000 */ nop -/* 573D98 80218478 468031A0 */ cvt.s.w $f6, $f6 -/* 573D9C 8021847C 3C013F80 */ lui $at, 0x3f80 -/* 573DA0 80218480 44811000 */ mtc1 $at, $f2 -/* 573DA4 80218484 46062103 */ div.s $f4, $f4, $f6 -/* 573DA8 80218488 46041081 */ sub.s $f2, $f2, $f4 -/* 573DAC 8021848C 46020502 */ mul.s $f20, $f0, $f2 -/* 573DB0 80218490 00000000 */ nop -/* 573DB4 80218494 44936000 */ mtc1 $s3, $f12 -/* 573DB8 80218498 00000000 */ nop -/* 573DBC 8021849C 46806320 */ cvt.s.w $f12, $f12 -/* 573DC0 802184A0 0C00A874 */ jal cos_rad -/* 573DC4 802184A4 460C4303 */ div.s $f12, $f8, $f12 -/* 573DC8 802184A8 4600A502 */ mul.s $f20, $f20, $f0 -/* 573DCC 802184AC 00000000 */ nop -/* 573DD0 802184B0 0220202D */ daddu $a0, $s1, $zero -/* 573DD4 802184B4 4600A28D */ trunc.w.s $f10, $f20 -/* 573DD8 802184B8 44065000 */ mfc1 $a2, $f10 -/* 573DDC 802184BC 0C0B2026 */ jal set_variable -/* 573DE0 802184C0 0280282D */ daddu $a1, $s4, $zero -/* 573DE4 802184C4 8FBF0024 */ lw $ra, 0x24($sp) -/* 573DE8 802184C8 8FB40020 */ lw $s4, 0x20($sp) -/* 573DEC 802184CC 8FB3001C */ lw $s3, 0x1c($sp) -/* 573DF0 802184D0 8FB20018 */ lw $s2, 0x18($sp) -/* 573DF4 802184D4 8FB10014 */ lw $s1, 0x14($sp) -/* 573DF8 802184D8 8FB00010 */ lw $s0, 0x10($sp) -/* 573DFC 802184DC D7B40028 */ ldc1 $f20, 0x28($sp) -/* 573E00 802184E0 24020002 */ addiu $v0, $zero, 2 -/* 573E04 802184E4 03E00008 */ jr $ra -/* 573E08 802184E8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 573E0C 802184EC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s b/ver/us/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s deleted file mode 100644 index 1fb08b26bb..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802185AC_512B7C -/* 512B7C 802185AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 512B80 802185B0 AFB10014 */ sw $s1, 0x14($sp) -/* 512B84 802185B4 0080882D */ daddu $s1, $a0, $zero -/* 512B88 802185B8 AFBF0024 */ sw $ra, 0x24($sp) -/* 512B8C 802185BC AFB40020 */ sw $s4, 0x20($sp) -/* 512B90 802185C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 512B94 802185C4 AFB20018 */ sw $s2, 0x18($sp) -/* 512B98 802185C8 AFB00010 */ sw $s0, 0x10($sp) -/* 512B9C 802185CC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 512BA0 802185D0 8E30000C */ lw $s0, 0xc($s1) -/* 512BA4 802185D4 8E050000 */ lw $a1, ($s0) -/* 512BA8 802185D8 0C0B1EAF */ jal get_variable -/* 512BAC 802185DC 26100004 */ addiu $s0, $s0, 4 -/* 512BB0 802185E0 8E140000 */ lw $s4, ($s0) -/* 512BB4 802185E4 26100004 */ addiu $s0, $s0, 4 -/* 512BB8 802185E8 8E050000 */ lw $a1, ($s0) -/* 512BBC 802185EC 26100004 */ addiu $s0, $s0, 4 -/* 512BC0 802185F0 0220202D */ daddu $a0, $s1, $zero -/* 512BC4 802185F4 0C0B1EAF */ jal get_variable -/* 512BC8 802185F8 0040902D */ daddu $s2, $v0, $zero -/* 512BCC 802185FC 8E050000 */ lw $a1, ($s0) -/* 512BD0 80218600 26100004 */ addiu $s0, $s0, 4 -/* 512BD4 80218604 0220202D */ daddu $a0, $s1, $zero -/* 512BD8 80218608 0C0B1EAF */ jal get_variable -/* 512BDC 8021860C 0040982D */ daddu $s3, $v0, $zero -/* 512BE0 80218610 0220202D */ daddu $a0, $s1, $zero -/* 512BE4 80218614 8E050000 */ lw $a1, ($s0) -/* 512BE8 80218618 0C0B210B */ jal get_float_variable -/* 512BEC 8021861C 0040802D */ daddu $s0, $v0, $zero -/* 512BF0 80218620 3C0140C9 */ lui $at, 0x40c9 -/* 512BF4 80218624 34210FD8 */ ori $at, $at, 0xfd8 -/* 512BF8 80218628 44814000 */ mtc1 $at, $f8 -/* 512BFC 8021862C 44922000 */ mtc1 $s2, $f4 -/* 512C00 80218630 00000000 */ nop -/* 512C04 80218634 46802120 */ cvt.s.w $f4, $f4 -/* 512C08 80218638 46082202 */ mul.s $f8, $f4, $f8 -/* 512C0C 8021863C 00000000 */ nop -/* 512C10 80218640 44903000 */ mtc1 $s0, $f6 -/* 512C14 80218644 00000000 */ nop -/* 512C18 80218648 468031A0 */ cvt.s.w $f6, $f6 -/* 512C1C 8021864C 3C013F80 */ lui $at, 0x3f80 -/* 512C20 80218650 44811000 */ mtc1 $at, $f2 -/* 512C24 80218654 46062103 */ div.s $f4, $f4, $f6 -/* 512C28 80218658 46041081 */ sub.s $f2, $f2, $f4 -/* 512C2C 8021865C 46020502 */ mul.s $f20, $f0, $f2 -/* 512C30 80218660 00000000 */ nop -/* 512C34 80218664 44936000 */ mtc1 $s3, $f12 -/* 512C38 80218668 00000000 */ nop -/* 512C3C 8021866C 46806320 */ cvt.s.w $f12, $f12 -/* 512C40 80218670 0C00A874 */ jal cos_rad -/* 512C44 80218674 460C4303 */ div.s $f12, $f8, $f12 -/* 512C48 80218678 4600A502 */ mul.s $f20, $f20, $f0 -/* 512C4C 8021867C 00000000 */ nop -/* 512C50 80218680 0220202D */ daddu $a0, $s1, $zero -/* 512C54 80218684 4600A28D */ trunc.w.s $f10, $f20 -/* 512C58 80218688 44065000 */ mfc1 $a2, $f10 -/* 512C5C 8021868C 0C0B2026 */ jal set_variable -/* 512C60 80218690 0280282D */ daddu $a1, $s4, $zero -/* 512C64 80218694 8FBF0024 */ lw $ra, 0x24($sp) -/* 512C68 80218698 8FB40020 */ lw $s4, 0x20($sp) -/* 512C6C 8021869C 8FB3001C */ lw $s3, 0x1c($sp) -/* 512C70 802186A0 8FB20018 */ lw $s2, 0x18($sp) -/* 512C74 802186A4 8FB10014 */ lw $s1, 0x14($sp) -/* 512C78 802186A8 8FB00010 */ lw $s0, 0x10($sp) -/* 512C7C 802186AC D7B40028 */ ldc1 $f20, 0x28($sp) -/* 512C80 802186B0 24020002 */ addiu $v0, $zero, 2 -/* 512C84 802186B4 03E00008 */ jr $ra -/* 512C88 802186B8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 512C8C 802186BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218CF4_5132C4.s b/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218CF4_5132C4.s deleted file mode 100644 index 810671ef3d..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_omo/512E50/func_80218CF4_5132C4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218CF4_5132C4 -/* 5132C4 80218CF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 5132C8 80218CF8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 5132CC 80218CFC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 5132D0 80218D00 2406FFFF */ addiu $a2, $zero, -1 -/* 5132D4 80218D04 AFBF0010 */ sw $ra, 0x10($sp) -/* 5132D8 80218D08 806200AE */ lb $v0, 0xae($v1) -/* 5132DC 80218D0C 10460007 */ beq $v0, $a2, .L80218D2C -/* 5132E0 80218D10 8C85000C */ lw $a1, 0xc($a0) -/* 5132E4 80218D14 806200AF */ lb $v0, 0xaf($v1) -/* 5132E8 80218D18 10460004 */ beq $v0, $a2, .L80218D2C -/* 5132EC 80218D1C 00000000 */ nop -/* 5132F0 80218D20 806200B0 */ lb $v0, 0xb0($v1) -/* 5132F4 80218D24 14460004 */ bne $v0, $a2, .L80218D38 -/* 5132F8 80218D28 00000000 */ nop -.L80218D2C: -/* 5132FC 80218D2C 8CA50000 */ lw $a1, ($a1) -/* 513300 80218D30 0808634F */ j .L80218D3C -/* 513304 80218D34 0000302D */ daddu $a2, $zero, $zero -.L80218D38: -/* 513308 80218D38 8CA50000 */ lw $a1, ($a1) -.L80218D3C: -/* 51330C 80218D3C 0C0B2026 */ jal set_variable -/* 513310 80218D40 00000000 */ nop -/* 513314 80218D44 8FBF0010 */ lw $ra, 0x10($sp) -/* 513318 80218D48 24020002 */ addiu $v0, $zero, 2 -/* 51331C 80218D4C 03E00008 */ jr $ra -/* 513320 80218D50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/area_omo3/5573E0/func_80218000_5573E0.s b/ver/us/asm/nonmatchings/battle/area_omo3/5573E0/func_80218000_5573E0.s deleted file mode 100644 index a2e98d11d7..0000000000 --- a/ver/us/asm/nonmatchings/battle/area_omo3/5573E0/func_80218000_5573E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80218000_5573E0 -/* 5573E0 80218000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 5573E4 80218004 AFBF0010 */ sw $ra, 0x10($sp) -/* 5573E8 80218008 0C09A75B */ jal get_actor -/* 5573EC 8021800C 8C840148 */ lw $a0, 0x148($a0) -/* 5573F0 80218010 3C05435C */ lui $a1, 0x435c -/* 5573F4 80218014 0C04DF69 */ jal set_screen_overlay_params_back -/* 5573F8 80218018 2404000D */ addiu $a0, $zero, 0xd -/* 5573FC 8021801C 3C054348 */ lui $a1, 0x4348 -/* 557400 80218020 0C04E035 */ jal set_screen_overlay_alpha -/* 557404 80218024 24040001 */ addiu $a0, $zero, 1 -/* 557408 80218028 8FBF0010 */ lw $ra, 0x10($sp) -/* 55740C 8021802C 24020002 */ addiu $v0, $zero, 2 -/* 557410 80218030 03E00008 */ jr $ra -/* 557414 80218034 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s b/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s index ddfef19603..ae6cf35898 100644 --- a/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s +++ b/ver/us/asm/nonmatchings/battle/partner/parakarry/func_80238000_6FFD80.s @@ -19,8 +19,8 @@ glabel func_80238000_6FFD80 /* 6FFDB8 80238038 F7B60070 */ sdc1 $f22, 0x70($sp) /* 6FFDBC 8023803C F7B40068 */ sdc1 $f20, 0x68($sp) /* 6FFDC0 80238040 8ED500DC */ lw $s5, 0xdc($s6) -/* 6FFDC4 80238044 3C04802A */ lui $a0, %hi(D_8029FBE0) -/* 6FFDC8 80238048 2484FBE0 */ addiu $a0, $a0, %lo(D_8029FBE0) +/* 6FFDC4 80238044 3C04802A */ lui $a0, %hi(gActionCommandStatus) +/* 6FFDC8 80238048 2484FBE0 */ addiu $a0, $a0, %lo(gActionCommandStatus) /* 6FFDCC 8023804C 10A00002 */ beqz $a1, .L80238058 /* 6FFDD0 80238050 26B4000C */ addiu $s4, $s5, 0xc /* 6FFDD4 80238054 AEE00070 */ sw $zero, 0x70($s7) diff --git a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830_DF9230.s b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830_DF9230.s deleted file mode 100644 index fbd4ff339b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830_DF9230.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242830_DF9230 -/* DF9230 80242830 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF9234 80242834 AFB10014 */ sw $s1, 0x14($sp) -/* DF9238 80242838 0080882D */ daddu $s1, $a0, $zero -/* DF923C 8024283C AFBF0018 */ sw $ra, 0x18($sp) -/* DF9240 80242840 AFB00010 */ sw $s0, 0x10($sp) -/* DF9244 80242844 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DF9248 80242848 8E30000C */ lw $s0, 0xc($s1) -/* DF924C 8024284C 8E050000 */ lw $a1, ($s0) -/* DF9250 80242850 0C0B1EAF */ jal get_variable -/* DF9254 80242854 26100004 */ addiu $s0, $s0, 4 -/* DF9258 80242858 0220202D */ daddu $a0, $s1, $zero -/* DF925C 8024285C 8E050000 */ lw $a1, ($s0) -/* DF9260 80242860 0C0B210B */ jal get_float_variable -/* DF9264 80242864 0040802D */ daddu $s0, $v0, $zero -/* DF9268 80242868 0220202D */ daddu $a0, $s1, $zero -/* DF926C 8024286C 0200282D */ daddu $a1, $s0, $zero -/* DF9270 80242870 0C0B36B0 */ jal resolve_npc -/* DF9274 80242874 46000506 */ mov.s $f20, $f0 -/* DF9278 80242878 E454007C */ swc1 $f20, 0x7c($v0) -/* DF927C 8024287C 8FBF0018 */ lw $ra, 0x18($sp) -/* DF9280 80242880 8FB10014 */ lw $s1, 0x14($sp) -/* DF9284 80242884 8FB00010 */ lw $s0, 0x10($sp) -/* DF9288 80242888 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DF928C 8024288C 24020002 */ addiu $v0, $zero, 2 -/* DF9290 80242890 03E00008 */ jr $ra -/* DF9294 80242894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242898_DF9298.s b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242898_DF9298.s deleted file mode 100644 index 324e25bcbe..0000000000 --- a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242898_DF9298.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242898_DF9298 -/* DF9298 80242898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF929C 8024289C AFB00010 */ sw $s0, 0x10($sp) -/* DF92A0 802428A0 0080802D */ daddu $s0, $a0, $zero -/* DF92A4 802428A4 AFBF0014 */ sw $ra, 0x14($sp) -/* DF92A8 802428A8 10A00006 */ beqz $a1, .L802428C4 -/* DF92AC 802428AC 8E02000C */ lw $v0, 0xc($s0) -/* DF92B0 802428B0 0C0B1EAF */ jal get_variable -/* DF92B4 802428B4 8C450000 */ lw $a1, ($v0) -/* DF92B8 802428B8 0C00EABB */ jal get_npc_unsafe -/* DF92BC 802428BC 0040202D */ daddu $a0, $v0, $zero -/* DF92C0 802428C0 AE020074 */ sw $v0, 0x74($s0) -.L802428C4: -/* DF92C4 802428C4 8E030074 */ lw $v1, 0x74($s0) -/* DF92C8 802428C8 3C013F2A */ lui $at, 0x3f2a -/* DF92CC 802428CC 3421AAAB */ ori $at, $at, 0xaaab -/* DF92D0 802428D0 44811000 */ mtc1 $at, $f2 -/* DF92D4 802428D4 C4600038 */ lwc1 $f0, 0x38($v1) -/* DF92D8 802428D8 46020000 */ add.s $f0, $f0, $f2 -/* DF92DC 802428DC E4600038 */ swc1 $f0, 0x38($v1) -/* DF92E0 802428E0 8FBF0014 */ lw $ra, 0x14($sp) -/* DF92E4 802428E4 8FB00010 */ lw $s0, 0x10($sp) -/* DF92E8 802428E8 0000102D */ daddu $v0, $zero, $zero -/* DF92EC 802428EC 03E00008 */ jr $ra -/* DF92F0 802428F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF92F4 802428F4 00000000 */ nop -/* DF92F8 802428F8 00000000 */ nop -/* DF92FC 802428FC 00000000 */ nop diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index edfd7cef57..08a83ab55e 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -5644,11 +5644,11 @@ func_802A9120_421B10 = 0x802A9120; // type:func rom:0x421B10 func_802A9234_421C24 = 0x802A9234; // type:func rom:0x421C24 func_802A9544_421F34 = 0x802A9544; // type:func rom:0x421F34 func_802A9590_421F80 = 0x802A9590; // type:func rom:0x421F80 -func_802A9000_422000 = 0x802A9000; // type:func rom:0x422000 +action_command_hammer_CreateHudElements = 0x802A9000; // type:func rom:0x422000 func_802A9258_422258 = 0x802A9258; // type:func rom:0x422258 func_802A936C_42236C = 0x802A936C; // type:func rom:0x42236C -func_802A99D4_4229D4 = 0x802A99D4; // type:func rom:0x4229D4 -func_802A9A30_422A30 = 0x802A9A30; // type:func rom:0x422A30 +action_command_hammer_DrawHudElements = 0x802A99D4; // type:func rom:0x4229D4 +action_command_hammer_FreeHudElements = 0x802A9A30; // type:func rom:0x422A30 func_802A9000_422AD0 = 0x802A9000; // type:func rom:0x422AD0 func_802A92A0_422D70 = 0x802A92A0; // type:func rom:0x422D70 func_802A9378_422E48 = 0x802A9378; // type:func rom:0x422E48 @@ -6067,7 +6067,7 @@ func_80218158_4CF308 = 0x80218158; // type:func rom:0x4CF308 func_80218170_4CF320 = 0x80218170; // type:func rom:0x4CF320 func_802181B4_4CF364 = 0x802181B4; // type:func rom:0x4CF364 func_802181F8_4CF3A8 = 0x802181F8; // type:func rom:0x4CF3A8 -func_80218000_4D01F0 = 0x80218000; // type:func rom:0x4D01F0 +b_area_iwa_SetSpinSmashable = 0x80218000; // type:func rom:0x4D01F0 b_area_iwa_StartRumbleWithParams = 0x8021805C; // type:func rom:0x4D024C dup_b_area_iwa_StartRumbleWithParams = 0x802180C0; // type:func rom:0x4D02B0 dup_b_area_iwa_IsSaveVar123 = 0x80218120; // type:func rom:0x4D0310 @@ -6137,7 +6137,7 @@ dup3_b_area_omo_UnkBattleFunc1 = 0x80218270; // type:func rom:0x512840 dup4_b_area_omo_UnkBattleFunc1 = 0x80218340; // type:func rom:0x512910 dup5_b_area_omo_UnkBattleFunc1 = 0x80218410; // type:func rom:0x5129E0 dup6_b_area_omo_UnkBattleFunc1 = 0x802184E0; // type:func rom:0x512AB0 -func_802185AC_512B7C = 0x802185AC; // type:func rom:0x512B7C +b_area_omo_MediGuySpriteRotationFunc = 0x802185AC; // type:func rom:0x512B7C dup7_b_area_omo_UnkBattleFunc1 = 0x802186C0; // type:func rom:0x512C90 func_8021878C_512D5C = 0x8021878C; // type:func rom:0x512D5C func_80218880_512E50 = 0x80218880; // type:func rom:0x512E50 @@ -6202,7 +6202,7 @@ dup3_b_area_jan_UnkBattleFunc1 = 0x802180D0; // type:func rom:0x5739F0 b_area_jan_UnkBattleFunc2 = 0x802181A0; // type:func rom:0x573AC0 b_area_jan_UnkBattleFunc2_2 = 0x80218254; // type:func rom:0x573B74 b_area_jan_UnkBattleFunc1 = 0x80218310; // type:func rom:0x573C30 -func_802183DC_573CFC = 0x802183DC; // type:func rom:0x573CFC +MediGuySpriteRotationFunc = 0x802183DC; // type:func rom:0x573CFC dup_b_area_jan_UnkBattleFunc1 = 0x802184F0; // type:func rom:0x573E10 dup_b_area_jan2_UnkBattleFunc1 = 0x80218000; // type:func rom:0x584940 func_802180CC_584A0C = 0x802180CC; // type:func rom:0x584A0C @@ -6257,7 +6257,7 @@ b_area_flo_UnkBattleFunc1 = 0x80218000; // type:func rom:0x5B14B0 func_802180CC_5B157C = 0x802180CC; // type:func rom:0x5B157C b_area_flo_UnkFloatFunc = 0x802181F0; // type:func rom:0x5B16A0 dup_b_area_flo_UnkBattleFunc1 = 0x80218380; // type:func rom:0x5B1830 -func_8021844C_5B18FC = 0x8021844C; // type:func rom:0x5B18FC +MediGuySpriteRotationFunc = 0x8021844C; // type:func rom:0x5B18FC func_80218560_5B1A10 = 0x80218560; // type:func rom:0x5B1A10 dup_b_area_flo_GetSelectedMoveID = 0x802186B8; // type:func rom:0x5B1B68 dup2_b_area_flo_UnkBattleFunc1 = 0x802186E4; // type:func rom:0x5B1B94 @@ -17232,7 +17232,7 @@ func_80242680_DF9080 = 0x80242680; // type:func rom:0xDF9080 func_80242744_DF9144 = 0x80242744; // type:func rom:0xDF9144 func_802427A4_DF91A4 = 0x802427A4; // type:func rom:0xDF91A4 func_802427D8_DF91D8 = 0x802427D8; // type:func rom:0xDF91D8 -func_80242830_DF9230 = 0x80242830; // type:func rom:0xDF9230 +end_00_SetNpcShadowScale = 0x80242830; // type:func rom:0xDF9230 func_80242898_DF9298 = 0x80242898; // type:func rom:0xDF9298 end_00_PlayFX3D = 0x80242900; // type:func rom:0xDF9300 func_80242A30_DF9430 = 0x80242A30; // type:func rom:0xDF9430 @@ -20048,7 +20048,7 @@ D_8029FBB0 = 0x8029FBB0; // type:data D_8029FBC0 = 0x8029FBC0; // type:data D_8029FBD0 = 0x8029FBD0; // type:data D_8029FBD4 = 0x8029FBD4; // type:data -D_8029FBE0 = 0x8029FBE0; // type:data +gActionCommandStatus = 0x8029FBE0; // type:data D_8029FBE4 = 0x8029FBE4; // type:data D_8029FC2A = 0x8029FC2A; // type:data D_8029FC3E = 0x8029FC3E; // type:data diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt index 25729950e9..e6d4fe0aa5 100644 --- a/ver/us/undefined_syms_auto.txt +++ b/ver/us/undefined_syms_auto.txt @@ -842,7 +842,7 @@ D_8029FBB0 = 0x8029FBB0; D_8029FBC0 = 0x8029FBC0; D_8029FBD0 = 0x8029FBD0; D_8029FBD4 = 0x8029FBD4; -D_8029FBE0 = 0x8029FBE0; +gActionCommandStatus = 0x8029FBE0; D_8029FBE4 = 0x8029FBE4; D_8029FC2A = 0x8029FC2A; D_8029FC3E = 0x8029FC3E;