From bf65da2020a518a2adabbdc158c73808b8ada280 Mon Sep 17 00:00:00 2001 From: eperdew Date: Sun, 10 Oct 2021 18:46:02 -0700 Subject: [PATCH] Decompile small action command functions (#468) * Decompile small functions in air_lift.c * Decompile small functions of 07.c * Decompile small functions in 0A.c and air_raid.c * Decompile func_802A96B8_423AA8 * Match func_802A91B0_4235A0 and fix warnings in break_free.c * Match small functions in dizzy_shell.c * Match small functions in fire_shell.c * Match easy functions in hurricane.c * Match easy functions in spiny_surge.c * Fix 2 --> DONE2 and leftover redundant assignments. --- src/battle/action_cmd/07.c | 99 ++++++++++++++- src/battle/action_cmd/0A.c | 53 +++++++- src/battle/action_cmd/air_lift.c | 65 +++++++++- src/battle/action_cmd/air_raid.c | 55 +++++++- src/battle/action_cmd/break_free.c | 80 ++++++++++-- src/battle/action_cmd/dizzy_shell.c | 52 +++++++- src/battle/action_cmd/fire_shell.c | 54 +++++++- src/battle/action_cmd/hurricane.c | 120 +++++++++++++++++- src/battle/action_cmd/spiny_surge.c | 82 +++++++++++- .../action_cmd/07/func_802A9000_425B50.s | 95 -------------- .../action_cmd/07/func_802A916C_425CBC.s | 51 -------- .../action_cmd/07/func_802A94D8_426028.s | 55 -------- .../action_cmd/0A/func_802A9000_4273B0.s | 98 -------------- .../air_lift/func_802A9184_428BF4.s | 65 ---------- .../air_lift/func_802A96EC_42915C.s | 82 ------------ .../air_raid/func_802A9000_429320.s | 100 --------------- .../break_free/func_802A91B0_4235A0.s | 81 ------------ .../break_free/func_802A96B8_423AA8.s | 88 ------------- .../dizzy_shell/func_802A9000_426170.s | 98 -------------- .../fire_shell/func_802A9000_4269D0.s | 100 --------------- .../hurricane/func_802A9000_42F6E0.s | 110 ---------------- .../hurricane/func_802A91A0_42F880.s | 70 ---------- .../hurricane/func_802A97AC_42FE8C.s | 64 ---------- .../hurricane/func_802A9894_42FF74.s | 23 ---- .../spiny_surge/func_802A9000_42EE20.s | 97 -------------- .../spiny_surge/func_802A916C_42EF8C.s | 64 ---------- 26 files changed, 634 insertions(+), 1367 deletions(-) delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9000_425B50.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A916C_425CBC.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A94D8_426028.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9000_4273B0.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9184_428BF4.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9000_429320.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A91B0_4235A0.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A96B8_423AA8.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9000_426170.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9000_4269D0.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9000_42F6E0.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A91A0_42F880.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A97AC_42FE8C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9894_42FF74.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9000_42EE20.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A916C_42EF8C.s diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index e576e8cc10..22b22bcb04 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -2,12 +2,105 @@ #define NAMESPACE action_command_07 -INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A9000_425B50); +extern s32 D_80294280; +extern s32 D_802A9620; +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80108B28; +extern HudElementAnim D_80109244; -INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A916C_425CBC); +s32 func_8024FAFC(s32); + +ApiStatus func_802A9000_425B50(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + Bytecode* args = script->ptrReadPos; + s32 hudElement; + s32 hudElementTemp; + + battleStatus->unk_82 = 5; + battleStatus->unk_434 = &D_80294280; + + actionCommandStatus->autoSucceed = 0; + actionCommandStatus->actionCommandID = 7; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = evt_get_variable(script, *args); + actionCommandStatus->hudElementX = -48; + actionCommandStatus->unk_48 = 0; + D_802A9620 = 0; + actionCommandStatus->hudElementY = 80; + + hudElement = create_hud_element(&D_80108B28); + 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, 0); + + // Weird use of an extra temp settles regalloc here. + hudElementTemp = create_hud_element(&D_80108AFC); + hudElement = hudElementTemp; + actionCommandStatus->hudElements[1] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80109244); + actionCommandStatus->hudElements[2] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + battleStatus->flags1 &= ~0x8000; + + return ApiStatus_DONE2; +} + +ApiStatus func_802A916C_425CBC(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32* args = script->ptrReadPos; + s32 mask; + + actionCommandStatus->autoSucceed = 0; + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); + + actionCommandStatus->unk_60 = 0; + battleStatus->actionSuccess = 0; + battleStatus->unk_86 = 0; + + battleStatus->flags1 &= ~0x8000; + func_8024FAFC(battleStatus->flags1); + actionCommandStatus->state = 10; + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A9228_425D78); -INCLUDE_ASM(s32, "battle/action_cmd/07", func_802A94D8_426028); +void func_802A94D8_426028(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + s32 hudX; + s32 hudY; + s32 hudElement1; + + draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + hudElement1 = actionCommandStatus->hudElements[1]; + draw_hud_element_clipped(hudElement1); + get_hud_element_render_pos(hudElement1, &hudX, &hudY); + + if (D_802A9620 == 0) { + func_80268798(hudX, hudY, actionCommandStatus->barFillLevel / 100, 1); + } else { + func_80268798(hudX, hudY, actionCommandStatus->barFillLevel / 100, 2); + } + + draw_hud_element_clipped(actionCommandStatus->hudElements[2]); +} #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index accde90b91..542120a72e 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -2,7 +2,58 @@ #define NAMESPACE action_command_0A -INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A9000_4273B0); +extern s32 D_802942E0; +extern HudElementAnim D_80292974; +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80108B28; + +ApiStatus func_802A9000_4273B0(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 hudElement; + + battleStatus->unk_82 = 100; + battleStatus->unk_434 = &D_802942E0; + battleStatus->unk_86 = 127; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + + actionCommandStatus->actionCommandID = 10; + actionCommandStatus->unk_61 = 1; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + actionCommandStatus->unk_68 = 0; + battleStatus->actionSuccess = 0; + actionCommandStatus->hudElementX = -48; + actionCommandStatus->hudElementY = 80; + + hudElement = create_hud_element(&D_80108B28); + actionCommandStatus->hudElements[0] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80108AFC); + actionCommandStatus->hudElements[1] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80292974); + actionCommandStatus->hudElements[2] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + return ApiStatus_DONE2; +} #include "common/MashActionCommandInit.inc.c" diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 0b10a0dbe1..c04a317c05 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -1,10 +1,14 @@ #include "common.h" +#include "effects.h" +#include "battle/battle.h" #define NAMESPACE action_command_air_lift -extern s32 D_80108AFC; -extern s32 D_80108B28; -extern s32 D_80292974; +void func_80268834(s32, s32, s16, s32); + +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80108B28; +extern HudElementAnim D_80292974; extern s32 D_80294340; BSS s32 air_lift_bss_0; @@ -54,10 +58,61 @@ ApiStatus func_802A9000_428A70(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/action_cmd/air_lift", func_802A9184_428BF4); +ApiStatus func_802A9184_428BF4(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + Bytecode* args = script->ptrReadPos; + u8 mashMeterCutoff; + + func_80268858(); + + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); + actionCommandStatus->unk_64 = evt_get_variable(script, *args++); + + actionCommandStatus->unk_60 = 0; + battleStatus->actionSuccess = 0; + battleStatus->unk_86 = 127; + + mashMeterCutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + actionCommandStatus->unk_5C = 0; + + battleStatus->flags1 &= ~0x8000; + actionCommandStatus->state = 10; + battleStatus->unk_82 = mashMeterCutoff; + + func_80269118(); + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/action_cmd/air_lift", func_802A9278_428CE8); -INCLUDE_ASM(s32, "battle/action_cmd/air_lift", func_802A96EC_42915C); +void func_802A96EC_42915C(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + s32 hudX; + s32 hudY; + s32 hudElement1; + + if (gBattleStatus.unk_83 != 0) { + draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + } + + hudElement1 = actionCommandStatus->hudElements[1]; + draw_hud_element_clipped(hudElement1); + get_hud_element_render_pos(hudElement1, &hudX, &hudY); + + if (air_lift_bss_0 == 0) { + func_80268798(hudX, hudY, actionCommandStatus->barFillLevel / 100, 1); + } else if (actionCommandStatus->unk_68 == 0) { + func_80268798(hudX, hudY, actionCommandStatus->barFillLevel / 100, 4); + } else { + func_80268834(hudX, hudY, actionCommandStatus->barFillLevel / 100, 4); + } + + draw_hud_element_clipped(actionCommandStatus->hudElements[2]); +} #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index dcbd9f6cdd..b881725606 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -2,7 +2,60 @@ #define NAMESPACE action_command_air_raid -INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A9000_429320); +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80108E1C; +extern HudElementAnim D_80292974; + +extern s32 D_80294360; + +ApiStatus func_802A9000_429320(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 hudElement; + + battleStatus->unk_82 = 100; + battleStatus->unk_434 = &D_80294360; + battleStatus->unk_86 = 127; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + + actionCommandStatus->actionCommandID = 14; + actionCommandStatus->unk_61 = 1; + actionCommandStatus->unk_6C = 30; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + actionCommandStatus->unk_68 = 0; + battleStatus->actionSuccess = 0; + actionCommandStatus->hudElementX = -48; + actionCommandStatus->hudElementY = 80; + + hudElement = create_hud_element(&D_80108E1C); + actionCommandStatus->hudElements[0] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80108AFC); + actionCommandStatus->hudElements[1] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80292974); + actionCommandStatus->hudElements[2] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + return ApiStatus_DONE2; +} #include "common/MashActionCommandInit.inc.c" diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 3da7767fea..c68151ffa1 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -3,15 +3,17 @@ #define NAMESPACE action_command_break_free extern s32 D_80294220; -extern s32 D_80108B28; -extern s32 D_80108AFC; -extern s32 D_802928F8; -extern s32 D_80109244; +extern HudElementAnim D_80108B28; +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_802928F8; +extern HudElementAnim D_80109244; + +s32 func_80268770(s32, s32, s16); ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; - HudElement* hudElement; + s32 hudElement; battleStatus->unk_82 = 0; battleStatus->unk_434 = &D_80294220; @@ -61,12 +63,74 @@ ApiStatus func_802A9000_4233F0(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/action_cmd/break_free", func_802A91B0_4235A0); +ApiStatus func_802A91B0_4235A0(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + Bytecode* args = script->ptrReadPos; + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_5A = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); + + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_46 = 0; + actionCommandStatus->unk_48 = 0; + + battleStatus->actionSuccess = 0; + battleStatus->unk_86 = 0x7F; + battleStatus->unk_82 = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + + actionCommandStatus->unk_46 = rand_int(actionCommandStatus->unk_5A); + actionCommandStatus->unk_5C = 0; + actionCommandStatus->state = 10; + battleStatus->flags1 &= ~0x8000; + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/action_cmd/break_free", func_802A92DC_4236CC); -// wip: https://decomp.me/scratch/l1uTc -INCLUDE_ASM(s32, "battle/action_cmd/break_free", func_802A96B8_423AA8); +void func_802A96B8_423AA8(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + s32* hudElements = actionCommandStatus->hudElements; + s32 hudX; + s32 hudY; + s32 hudElement; + s16 mashMeterCutoff; + s32 thirtyOne; + + mashMeterCutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + hudX = 60 - ((mashMeterCutoff - actionCommandStatus->unk_46) * 60 / mashMeterCutoff); + + // Putting 31 into a variable manually fixes regalloc, so perhaps this was a constant defined somewhere? + thirtyOne = 31; + set_hud_element_render_pos(hudElements[3], actionCommandStatus->hudElementX - (hudX - thirtyOne), + actionCommandStatus->hudElementY + 17); + set_hud_element_render_pos(hudElements[2], actionCommandStatus->hudElementX - (hudX - thirtyOne), + actionCommandStatus->hudElementY - 1); + + if (actionCommandStatus->unk_6A == 0) { + draw_hud_element_clipped(hudElements[0]); + } + + hudElement = hudElements[1]; + draw_hud_element_clipped(hudElement); + get_hud_element_render_pos(hudElement, &hudX, &hudY); + + func_80268770(hudX, hudY, actionCommandStatus->barFillLevel / 100); + draw_hud_element_clipped(hudElements[2]); + draw_hud_element_clipped(hudElements[3]); +} + void func_802A97FC_423BEC(void) { free_hud_element(gActionCommandStatus.hudElements[0]); diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 240fb5a362..4f14b57e45 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -2,7 +2,57 @@ #define NAMESPACE action_command_dizzy_shell -INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A9000_426170); +extern s32 D_802942A0; +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80108B28; +extern HudElementAnim D_80292974; + +ApiStatus func_802A9000_426170(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 hudElement; + + battleStatus->unk_82 = 100; + battleStatus->unk_434 = &D_802942A0; + battleStatus->unk_86 = 127; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + actionCommandStatus->actionCommandID = 8; + actionCommandStatus->unk_61 = 1; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + actionCommandStatus->unk_68 = 0; + battleStatus->actionSuccess = 0; + actionCommandStatus->hudElementX = -48; + actionCommandStatus->hudElementY = 80; + + hudElement = create_hud_element(&D_80108B28); + actionCommandStatus->hudElements[0] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80108AFC); + actionCommandStatus->hudElements[1] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80292974); + actionCommandStatus->hudElements[2] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + return ApiStatus_DONE2; +} #include "common/MashActionCommandInit.inc.c" diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index 9953f7f30f..9f1856c416 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -2,7 +2,59 @@ #define NAMESPACE action_command_fire_shell -INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9000_4269D0); +extern s32 D_802942C0; +extern HudElementAnim D_80108E1C; +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80292974; + +ApiStatus func_802A9000_4269D0(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 hudElement; + + battleStatus->unk_82 = 100; + battleStatus->unk_434 = &D_802942C0; + battleStatus->unk_86 = 127; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + func_80268858(); + + actionCommandStatus->actionCommandID = 9; + actionCommandStatus->unk_61 = 1; + actionCommandStatus->unk_6C = 0x1E; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + actionCommandStatus->unk_68 = 0; + battleStatus->actionSuccess = 0; + actionCommandStatus->hudElementX = -48; + actionCommandStatus->hudElementY = 80; + + hudElement = create_hud_element(&D_80108E1C); + actionCommandStatus->hudElements[0] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80108AFC); + actionCommandStatus->hudElements[1] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80292974); + actionCommandStatus->hudElements[2] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + return ApiStatus_DONE2; +} + #include "common/MashActionCommandInit.inc.c" diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index f0daba43f2..db9e3f447a 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -2,12 +2,124 @@ #define NAMESPACE action_command_hurricane -INCLUDE_ASM(s32, "battle/action_cmd/hurricane", func_802A9000_42F6E0); +void func_80268770(s32, s32, s16); +void func_8026880C(s32, s32, s16); -INCLUDE_ASM(s32, "battle/action_cmd/hurricane", func_802A91A0_42F880); +extern s32 D_80294420; +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80108B28; +extern HudElementAnim D_8029231C; +extern HudElementAnim D_80292974; + +ApiStatus func_802A9000_42F6E0(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 hudElement; + + battleStatus->unk_82 = 5; + battleStatus->unk_434 = &D_80294420; + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + + actionCommandStatus->actionCommandID = 20; + actionCommandStatus->unk_6C = 30; + actionCommandStatus->hudElementX = -48; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + actionCommandStatus->unk_68 = 0; + actionCommandStatus->hudElementY = 80; + + hudElement = create_hud_element(&D_80108B28); + 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, 0); + + hudElement = create_hud_element(&D_8029231C); + 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_80108AFC); + actionCommandStatus->hudElements[1] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80292974); + actionCommandStatus->hudElements[4] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A91A0_42F880(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32* args = script->ptrReadPos; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++);; + actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); + actionCommandStatus->unk_64 = evt_get_variable(script, *args++); + + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + battleStatus->actionSuccess = 0; + battleStatus->unk_86 = 0; + actionCommandStatus->state = 10; + battleStatus->flags1 &= ~0x8000; + + func_80269118(); + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/action_cmd/hurricane", func_802A92A0_42F980); -INCLUDE_ASM(s32, "battle/action_cmd/hurricane", func_802A97AC_42FE8C); +void func_802A97AC_42FE8C(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + s32 hudY; + s32 hudX; + s32 hudElement; -INCLUDE_ASM(s32, "battle/action_cmd/hurricane", func_802A9894_42FF74); + draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + draw_hud_element_clipped(actionCommandStatus->hudElements[2]); + + hudElement = actionCommandStatus->hudElements[1]; + draw_hud_element_clipped(hudElement); + get_hud_element_render_pos(hudElement, &hudX, &hudY); + + if (actionCommandStatus->unk_68 == 0) { + func_80268770(hudX, hudY, actionCommandStatus->barFillLevel / 100); + } else { + func_8026880C(hudX, hudY, actionCommandStatus->barFillLevel / 100); + } + + draw_hud_element_clipped(actionCommandStatus->hudElements[4]); +} + +void func_802A9894_42FF74(void) { + free_hud_element(gActionCommandStatus.hudElements[0]); + free_hud_element(gActionCommandStatus.hudElements[1]); + free_hud_element(gActionCommandStatus.hudElements[2]); + free_hud_element(gActionCommandStatus.hudElements[4]); +} diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index 657c140ac5..3c60fa8b63 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -2,9 +2,87 @@ #define NAMESPACE action_command_spiny_surge -INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A9000_42EE20); +extern s32 D_80294400; +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80108E1C; +extern HudElementAnim D_80292974; -INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A916C_42EF8C); +ApiStatus func_802A9000_42EE20(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 hudElement; + + battleStatus->unk_82 = 0x10; + battleStatus->unk_434 = &D_80294400; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + + actionCommandStatus->actionCommandID = 19; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + actionCommandStatus->unk_68 = 0; + battleStatus->actionSuccess = 0; + battleStatus->unk_86 = 0; + actionCommandStatus->unk_6C = 30; + actionCommandStatus->hudElementX = -48; + actionCommandStatus->hudElementY = 80; + + hudElement = create_hud_element(&D_80108E1C); + actionCommandStatus->hudElements[0] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80108AFC); + actionCommandStatus->hudElements[1] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + hudElement = create_hud_element(&D_80292974); + actionCommandStatus->hudElements[2] = hudElement; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX, actionCommandStatus->hudElementY + 28); + set_hud_element_render_depth(hudElement, 0); + set_hud_element_flags(hudElement, 0x82); + + return ApiStatus_DONE2; +} + +ApiStatus func_802A916C_42EF8C(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32* args = script->ptrReadPos; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + + actionCommandStatus->unk_4E = evt_get_variable(script, *args++); + actionCommandStatus->unk_52 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = evt_get_variable(script, *args++); + actionCommandStatus->unk_50 = func_80268224(actionCommandStatus->unk_50); + + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + battleStatus->actionSuccess = 0; + actionCommandStatus->state = 10; + battleStatus->flags1 &= ~0x8000; + + func_80269118(); + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A9254_42F074); 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 deleted file mode 100644 index 09af60022f..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A9000_425B50.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_425B50 -/* 425B50 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 425B54 802A9004 AFB20018 */ sw $s2, 0x18($sp) -/* 425B58 802A9008 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 425B5C 802A900C 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 425B60 802A9010 AFBF001C */ sw $ra, 0x1c($sp) -/* 425B64 802A9014 AFB10014 */ sw $s1, 0x14($sp) -/* 425B68 802A9018 AFB00010 */ sw $s0, 0x10($sp) -/* 425B6C 802A901C 8C83000C */ lw $v1, 0xc($a0) -/* 425B70 802A9020 24020005 */ addiu $v0, $zero, 5 -/* 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(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) -/* 425B94 802A9044 A602004A */ sh $v0, 0x4a($s0) -/* 425B98 802A9048 A600004C */ sh $zero, 0x4c($s0) -/* 425B9C 802A904C A2000060 */ sb $zero, 0x60($s0) -/* 425BA0 802A9050 0C0B1EAF */ jal evt_get_variable -/* 425BA4 802A9054 8C650000 */ lw $a1, ($v1) -/* 425BA8 802A9058 3C048011 */ lui $a0, %hi(D_80108B28) -/* 425BAC 802A905C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) -/* 425BB0 802A9060 A6020044 */ sh $v0, 0x44($s0) -/* 425BB4 802A9064 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 425BB8 802A9068 A6020056 */ sh $v0, 0x56($s0) -/* 425BBC 802A906C 24020050 */ addiu $v0, $zero, 0x50 -/* 425BC0 802A9070 A6000048 */ sh $zero, 0x48($s0) -/* 425BC4 802A9074 3C01802B */ lui $at, %hi(D_802A9620) -/* 425BC8 802A9078 AC209620 */ sw $zero, %lo(D_802A9620)($at) -/* 425BCC 802A907C 0C050529 */ jal create_hud_element -/* 425BD0 802A9080 A6020058 */ sh $v0, 0x58($s0) -/* 425BD4 802A9084 0040882D */ daddu $s1, $v0, $zero -/* 425BD8 802A9088 0220202D */ daddu $a0, $s1, $zero -/* 425BDC 802A908C 24050082 */ addiu $a1, $zero, 0x82 -/* 425BE0 802A9090 0C051280 */ jal set_hud_element_flags -/* 425BE4 802A9094 AE110004 */ sw $s1, 4($s0) -/* 425BE8 802A9098 86050056 */ lh $a1, 0x56($s0) -/* 425BEC 802A909C 86060058 */ lh $a2, 0x58($s0) -/* 425BF0 802A90A0 0C051261 */ jal set_hud_element_render_pos -/* 425BF4 802A90A4 0220202D */ daddu $a0, $s1, $zero -/* 425BF8 802A90A8 0220202D */ daddu $a0, $s1, $zero -/* 425BFC 802A90AC 0C051277 */ jal set_hud_element_render_depth -/* 425C00 802A90B0 0000282D */ daddu $a1, $zero, $zero -/* 425C04 802A90B4 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 425C08 802A90B8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) -/* 425C0C 802A90BC 0C050529 */ jal create_hud_element -/* 425C10 802A90C0 00000000 */ nop -/* 425C14 802A90C4 0040882D */ daddu $s1, $v0, $zero -/* 425C18 802A90C8 86050056 */ lh $a1, 0x56($s0) -/* 425C1C 802A90CC 86060058 */ lh $a2, 0x58($s0) -/* 425C20 802A90D0 0220202D */ daddu $a0, $s1, $zero -/* 425C24 802A90D4 AE110008 */ sw $s1, 8($s0) -/* 425C28 802A90D8 0C051261 */ jal set_hud_element_render_pos -/* 425C2C 802A90DC 24C6001C */ addiu $a2, $a2, 0x1c -/* 425C30 802A90E0 0220202D */ daddu $a0, $s1, $zero -/* 425C34 802A90E4 0C051277 */ jal set_hud_element_render_depth -/* 425C38 802A90E8 0000282D */ daddu $a1, $zero, $zero -/* 425C3C 802A90EC 0220202D */ daddu $a0, $s1, $zero -/* 425C40 802A90F0 0C051280 */ jal set_hud_element_flags -/* 425C44 802A90F4 24050082 */ addiu $a1, $zero, 0x82 -/* 425C48 802A90F8 3C048011 */ lui $a0, %hi(D_80109244) -/* 425C4C 802A90FC 24849244 */ addiu $a0, $a0, %lo(D_80109244) -/* 425C50 802A9100 0C050529 */ jal create_hud_element -/* 425C54 802A9104 00000000 */ nop -/* 425C58 802A9108 0040882D */ daddu $s1, $v0, $zero -/* 425C5C 802A910C 86050056 */ lh $a1, 0x56($s0) -/* 425C60 802A9110 86060058 */ lh $a2, 0x58($s0) -/* 425C64 802A9114 0220202D */ daddu $a0, $s1, $zero -/* 425C68 802A9118 AE11000C */ sw $s1, 0xc($s0) -/* 425C6C 802A911C 0C051261 */ jal set_hud_element_render_pos -/* 425C70 802A9120 24C6001C */ addiu $a2, $a2, 0x1c -/* 425C74 802A9124 0220202D */ daddu $a0, $s1, $zero -/* 425C78 802A9128 0C051277 */ jal set_hud_element_render_depth -/* 425C7C 802A912C 0000282D */ daddu $a1, $zero, $zero -/* 425C80 802A9130 0220202D */ daddu $a0, $s1, $zero -/* 425C84 802A9134 0C051280 */ jal set_hud_element_flags -/* 425C88 802A9138 24050082 */ addiu $a1, $zero, 0x82 -/* 425C8C 802A913C 3C04FFFF */ lui $a0, 0xffff -/* 425C90 802A9140 8E430000 */ lw $v1, ($s2) -/* 425C94 802A9144 34847FFF */ ori $a0, $a0, 0x7fff -/* 425C98 802A9148 00641824 */ and $v1, $v1, $a0 -/* 425C9C 802A914C AE430000 */ sw $v1, ($s2) -/* 425CA0 802A9150 8FBF001C */ lw $ra, 0x1c($sp) -/* 425CA4 802A9154 8FB20018 */ lw $s2, 0x18($sp) -/* 425CA8 802A9158 8FB10014 */ lw $s1, 0x14($sp) -/* 425CAC 802A915C 8FB00010 */ lw $s0, 0x10($sp) -/* 425CB0 802A9160 24020002 */ addiu $v0, $zero, 2 -/* 425CB4 802A9164 03E00008 */ jr $ra -/* 425CB8 802A9168 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index a0c1240935..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A916C_425CBC.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A916C_425CBC -/* 425CBC 802A916C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 425CC0 802A9170 AFB20018 */ sw $s2, 0x18($sp) -/* 425CC4 802A9174 0080902D */ daddu $s2, $a0, $zero -/* 425CC8 802A9178 AFBF001C */ sw $ra, 0x1c($sp) -/* 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(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 evt_get_variable -/* 425CEC 802A919C 26100004 */ addiu $s0, $s0, 4 -/* 425CF0 802A91A0 A622004E */ sh $v0, 0x4e($s1) -/* 425CF4 802A91A4 8E050000 */ lw $a1, ($s0) -/* 425CF8 802A91A8 26100004 */ addiu $s0, $s0, 4 -/* 425CFC 802A91AC 0C0B1EAF */ jal evt_get_variable -/* 425D00 802A91B0 0240202D */ daddu $a0, $s2, $zero -/* 425D04 802A91B4 A6220052 */ sh $v0, 0x52($s1) -/* 425D08 802A91B8 8E050000 */ lw $a1, ($s0) -/* 425D0C 802A91BC 0C0B1EAF */ jal evt_get_variable -/* 425D10 802A91C0 0240202D */ daddu $a0, $s2, $zero -/* 425D14 802A91C4 00022400 */ sll $a0, $v0, 0x10 -/* 425D18 802A91C8 00042403 */ sra $a0, $a0, 0x10 -/* 425D1C 802A91CC 0C09A089 */ jal func_80268224 -/* 425D20 802A91D0 A6220050 */ sh $v0, 0x50($s1) -/* 425D24 802A91D4 3C05FFFF */ lui $a1, 0xffff -/* 425D28 802A91D8 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 425D2C 802A91DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 425D30 802A91E0 8C640000 */ lw $a0, ($v1) -/* 425D34 802A91E4 34A57FFF */ ori $a1, $a1, 0x7fff -/* 425D38 802A91E8 A6220050 */ sh $v0, 0x50($s1) -/* 425D3C 802A91EC A2200060 */ sb $zero, 0x60($s1) -/* 425D40 802A91F0 A0600081 */ sb $zero, 0x81($v1) -/* 425D44 802A91F4 A0600086 */ sb $zero, 0x86($v1) -/* 425D48 802A91F8 00852024 */ and $a0, $a0, $a1 -/* 425D4C 802A91FC 0C093EBF */ jal func_8024FAFC -/* 425D50 802A9200 AC640000 */ sw $a0, ($v1) -/* 425D54 802A9204 2403000A */ addiu $v1, $zero, 0xa -/* 425D58 802A9208 A623004C */ sh $v1, 0x4c($s1) -/* 425D5C 802A920C 8FBF001C */ lw $ra, 0x1c($sp) -/* 425D60 802A9210 8FB20018 */ lw $s2, 0x18($sp) -/* 425D64 802A9214 8FB10014 */ lw $s1, 0x14($sp) -/* 425D68 802A9218 8FB00010 */ lw $s0, 0x10($sp) -/* 425D6C 802A921C 24020002 */ addiu $v0, $zero, 2 -/* 425D70 802A9220 03E00008 */ jr $ra -/* 425D74 802A9224 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index 4c599e1095..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/07/func_802A94D8_426028.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A94D8_426028 -/* 426028 802A94D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 42602C 802A94DC AFB1001C */ sw $s1, 0x1c($sp) -/* 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 -/* 426044 802A94F4 8E240004 */ lw $a0, 4($s1) -/* 426048 802A94F8 8E300008 */ lw $s0, 8($s1) -/* 42604C 802A94FC 0C0511EA */ jal draw_hud_element_clipped -/* 426050 802A9500 0200202D */ daddu $a0, $s0, $zero -/* 426054 802A9504 0200202D */ daddu $a0, $s0, $zero -/* 426058 802A9508 27A50010 */ addiu $a1, $sp, 0x10 -/* 42605C 802A950C 0C05126B */ jal get_hud_element_render_pos -/* 426060 802A9510 27A60014 */ addiu $a2, $sp, 0x14 -/* 426064 802A9514 3C02802B */ lui $v0, %hi(D_802A9620) -/* 426068 802A9518 8C429620 */ lw $v0, %lo(D_802A9620)($v0) -/* 42606C 802A951C 14400008 */ bnez $v0, .L802A9540 -/* 426070 802A9520 3C0451EB */ lui $a0, 0x51eb -/* 426074 802A9524 96230044 */ lhu $v1, 0x44($s1) -/* 426078 802A9528 3484851F */ ori $a0, $a0, 0x851f -/* 42607C 802A952C 00031C00 */ sll $v1, $v1, 0x10 -/* 426080 802A9530 00031403 */ sra $v0, $v1, 0x10 -/* 426084 802A9534 00440018 */ mult $v0, $a0 -/* 426088 802A9538 080AA556 */ j .L802A9558 -/* 42608C 802A953C 24070001 */ addiu $a3, $zero, 1 -.L802A9540: -/* 426090 802A9540 96230044 */ lhu $v1, 0x44($s1) -/* 426094 802A9544 3484851F */ ori $a0, $a0, 0x851f -/* 426098 802A9548 00031C00 */ sll $v1, $v1, 0x10 -/* 42609C 802A954C 00031403 */ sra $v0, $v1, 0x10 -/* 4260A0 802A9550 00440018 */ mult $v0, $a0 -/* 4260A4 802A9554 24070002 */ addiu $a3, $zero, 2 -.L802A9558: -/* 4260A8 802A9558 8FA50014 */ lw $a1, 0x14($sp) -/* 4260AC 802A955C 00031FC3 */ sra $v1, $v1, 0x1f -/* 4260B0 802A9560 8FA40010 */ lw $a0, 0x10($sp) -/* 4260B4 802A9564 00004010 */ mfhi $t0 -/* 4260B8 802A9568 00083143 */ sra $a2, $t0, 5 -/* 4260BC 802A956C 00C33023 */ subu $a2, $a2, $v1 -/* 4260C0 802A9570 00063400 */ sll $a2, $a2, 0x10 -/* 4260C4 802A9574 0C09A1E6 */ jal func_80268798 -/* 4260C8 802A9578 00063403 */ sra $a2, $a2, 0x10 -/* 4260CC 802A957C 8E24000C */ lw $a0, 0xc($s1) -/* 4260D0 802A9580 0C0511EA */ jal draw_hud_element_clipped -/* 4260D4 802A9584 00000000 */ nop -/* 4260D8 802A9588 8FBF0020 */ lw $ra, 0x20($sp) -/* 4260DC 802A958C 8FB1001C */ lw $s1, 0x1c($sp) -/* 4260E0 802A9590 8FB00018 */ lw $s0, 0x18($sp) -/* 4260E4 802A9594 03E00008 */ jr $ra -/* 4260E8 802A9598 27BD0028 */ addiu $sp, $sp, 0x28 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 deleted file mode 100644 index e3baa97306..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/0A/func_802A9000_4273B0.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_4273B0 -/* 4273B0 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 4273B4 802A9004 AFB00010 */ sw $s0, 0x10($sp) -/* 4273B8 802A9008 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 4273BC 802A900C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 4273C0 802A9010 24020064 */ addiu $v0, $zero, 0x64 -/* 4273C4 802A9014 AFBF0018 */ sw $ra, 0x18($sp) -/* 4273C8 802A9018 AFB10014 */ sw $s1, 0x14($sp) -/* 4273CC 802A901C A2020082 */ sb $v0, 0x82($s0) -/* 4273D0 802A9020 3C028029 */ lui $v0, %hi(D_802942E0) -/* 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(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 -/* 4273F4 802A9044 0200182D */ daddu $v1, $s0, $zero -/* 4273F8 802A9048 0C09A216 */ jal func_80268858 -/* 4273FC 802A904C 00000000 */ nop -/* 427400 802A9050 3C048011 */ lui $a0, %hi(D_80108B28) -/* 427404 802A9054 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) -/* 427408 802A9058 2402000A */ addiu $v0, $zero, 0xa -/* 42740C 802A905C A622004A */ sh $v0, 0x4a($s1) -/* 427410 802A9060 24020001 */ addiu $v0, $zero, 1 -/* 427414 802A9064 A2220061 */ sb $v0, 0x61($s1) -/* 427418 802A9068 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 42741C 802A906C A620004C */ sh $zero, 0x4c($s1) -/* 427420 802A9070 A2200060 */ sb $zero, 0x60($s1) -/* 427424 802A9074 A6200044 */ sh $zero, 0x44($s1) -/* 427428 802A9078 A6200048 */ sh $zero, 0x48($s1) -/* 42742C 802A907C A6200068 */ sh $zero, 0x68($s1) -/* 427430 802A9080 A2000081 */ sb $zero, 0x81($s0) -/* 427434 802A9084 A6220056 */ sh $v0, 0x56($s1) -/* 427438 802A9088 24020050 */ addiu $v0, $zero, 0x50 -/* 42743C 802A908C 0C050529 */ jal create_hud_element -/* 427440 802A9090 A6220058 */ sh $v0, 0x58($s1) -/* 427444 802A9094 0040802D */ daddu $s0, $v0, $zero -/* 427448 802A9098 86250056 */ lh $a1, 0x56($s1) -/* 42744C 802A909C 86260058 */ lh $a2, 0x58($s1) -/* 427450 802A90A0 0200202D */ daddu $a0, $s0, $zero -/* 427454 802A90A4 0C051261 */ jal set_hud_element_render_pos -/* 427458 802A90A8 AE300004 */ sw $s0, 4($s1) -/* 42745C 802A90AC 0200202D */ daddu $a0, $s0, $zero -/* 427460 802A90B0 0C051277 */ jal set_hud_element_render_depth -/* 427464 802A90B4 0000282D */ daddu $a1, $zero, $zero -/* 427468 802A90B8 0200202D */ daddu $a0, $s0, $zero -/* 42746C 802A90BC 0C051280 */ jal set_hud_element_flags -/* 427470 802A90C0 24050082 */ addiu $a1, $zero, 0x82 -/* 427474 802A90C4 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 427478 802A90C8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) -/* 42747C 802A90CC 0C050529 */ jal create_hud_element -/* 427480 802A90D0 00000000 */ nop -/* 427484 802A90D4 0040802D */ daddu $s0, $v0, $zero -/* 427488 802A90D8 86250056 */ lh $a1, 0x56($s1) -/* 42748C 802A90DC 86260058 */ lh $a2, 0x58($s1) -/* 427490 802A90E0 0200202D */ daddu $a0, $s0, $zero -/* 427494 802A90E4 AE300008 */ sw $s0, 8($s1) -/* 427498 802A90E8 0C051261 */ jal set_hud_element_render_pos -/* 42749C 802A90EC 24C6001C */ addiu $a2, $a2, 0x1c -/* 4274A0 802A90F0 0200202D */ daddu $a0, $s0, $zero -/* 4274A4 802A90F4 0C051277 */ jal set_hud_element_render_depth -/* 4274A8 802A90F8 0000282D */ daddu $a1, $zero, $zero -/* 4274AC 802A90FC 0200202D */ daddu $a0, $s0, $zero -/* 4274B0 802A9100 0C051280 */ jal set_hud_element_flags -/* 4274B4 802A9104 24050082 */ addiu $a1, $zero, 0x82 -/* 4274B8 802A9108 3C048029 */ lui $a0, %hi(D_80292974) -/* 4274BC 802A910C 24842974 */ addiu $a0, $a0, %lo(D_80292974) -/* 4274C0 802A9110 0C050529 */ jal create_hud_element -/* 4274C4 802A9114 00000000 */ nop -/* 4274C8 802A9118 0040802D */ daddu $s0, $v0, $zero -/* 4274CC 802A911C 86250056 */ lh $a1, 0x56($s1) -/* 4274D0 802A9120 86260058 */ lh $a2, 0x58($s1) -/* 4274D4 802A9124 0200202D */ daddu $a0, $s0, $zero -/* 4274D8 802A9128 AE30000C */ sw $s0, 0xc($s1) -/* 4274DC 802A912C 0C051261 */ jal set_hud_element_render_pos -/* 4274E0 802A9130 24C6001C */ addiu $a2, $a2, 0x1c -/* 4274E4 802A9134 0200202D */ daddu $a0, $s0, $zero -/* 4274E8 802A9138 0C051277 */ jal set_hud_element_render_depth -/* 4274EC 802A913C 0000282D */ daddu $a1, $zero, $zero -/* 4274F0 802A9140 0200202D */ daddu $a0, $s0, $zero -/* 4274F4 802A9144 0C051280 */ jal set_hud_element_flags -/* 4274F8 802A9148 24050082 */ addiu $a1, $zero, 0x82 -/* 4274FC 802A914C 080AA457 */ j .L802A915C -/* 427500 802A9150 24020002 */ addiu $v0, $zero, 2 -.L802A9154: -/* 427504 802A9154 A0600081 */ sb $zero, 0x81($v1) -/* 427508 802A9158 24020002 */ addiu $v0, $zero, 2 -.L802A915C: -/* 42750C 802A915C 8FBF0018 */ lw $ra, 0x18($sp) -/* 427510 802A9160 8FB10014 */ lw $s1, 0x14($sp) -/* 427514 802A9164 8FB00010 */ lw $s0, 0x10($sp) -/* 427518 802A9168 03E00008 */ jr $ra -/* 42751C 802A916C 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index 890aee51e9..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9184_428BF4.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9184_428BF4 -/* 428BF4 802A9184 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 428BF8 802A9188 AFB20018 */ sw $s2, 0x18($sp) -/* 428BFC 802A918C 0080902D */ daddu $s2, $a0, $zero -/* 428C00 802A9190 AFBF001C */ sw $ra, 0x1c($sp) -/* 428C04 802A9194 AFB10014 */ sw $s1, 0x14($sp) -/* 428C08 802A9198 AFB00010 */ sw $s0, 0x10($sp) -/* 428C0C 802A919C 0C09A216 */ jal func_80268858 -/* 428C10 802A91A0 8E50000C */ lw $s0, 0xc($s2) -/* 428C14 802A91A4 0240202D */ daddu $a0, $s2, $zero -/* 428C18 802A91A8 8E050000 */ lw $a1, ($s0) -/* 428C1C 802A91AC 0C0B1EAF */ jal evt_get_variable -/* 428C20 802A91B0 26100004 */ addiu $s0, $s0, 4 -/* 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 -/* 428C38 802A91C8 0C0B1EAF */ jal evt_get_variable -/* 428C3C 802A91CC 0240202D */ daddu $a0, $s2, $zero -/* 428C40 802A91D0 A6220052 */ sh $v0, 0x52($s1) -/* 428C44 802A91D4 8E050000 */ lw $a1, ($s0) -/* 428C48 802A91D8 26100004 */ addiu $s0, $s0, 4 -/* 428C4C 802A91DC 0C0B1EAF */ jal evt_get_variable -/* 428C50 802A91E0 0240202D */ daddu $a0, $s2, $zero -/* 428C54 802A91E4 00022400 */ sll $a0, $v0, 0x10 -/* 428C58 802A91E8 00042403 */ sra $a0, $a0, 0x10 -/* 428C5C 802A91EC 0C09A089 */ jal func_80268224 -/* 428C60 802A91F0 A6220050 */ sh $v0, 0x50($s1) -/* 428C64 802A91F4 A6220050 */ sh $v0, 0x50($s1) -/* 428C68 802A91F8 8E050000 */ lw $a1, ($s0) -/* 428C6C 802A91FC 0C0B1EAF */ jal evt_get_variable -/* 428C70 802A9200 0240202D */ daddu $a0, $s2, $zero -/* 428C74 802A9204 3C05FFFF */ lui $a1, 0xffff -/* 428C78 802A9208 3C04800E */ lui $a0, %hi(gBattleStatus) -/* 428C7C 802A920C 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) -/* 428C80 802A9210 A6220064 */ sh $v0, 0x64($s1) -/* 428C84 802A9214 A2200060 */ sb $zero, 0x60($s1) -/* 428C88 802A9218 A0800081 */ sb $zero, 0x81($a0) -/* 428C8C 802A921C 82220080 */ lb $v0, 0x80($s1) -/* 428C90 802A9220 2403007F */ addiu $v1, $zero, 0x7f -/* 428C94 802A9224 A0830086 */ sb $v1, 0x86($a0) -/* 428C98 802A9228 2442FFFF */ addiu $v0, $v0, -1 -/* 428C9C 802A922C 00021040 */ sll $v0, $v0, 1 -/* 428CA0 802A9230 00511021 */ addu $v0, $v0, $s1 -/* 428CA4 802A9234 90430075 */ lbu $v1, 0x75($v0) -/* 428CA8 802A9238 8C820000 */ lw $v0, ($a0) -/* 428CAC 802A923C 34A57FFF */ ori $a1, $a1, 0x7fff -/* 428CB0 802A9240 A220005C */ sb $zero, 0x5c($s1) -/* 428CB4 802A9244 00451024 */ and $v0, $v0, $a1 -/* 428CB8 802A9248 AC820000 */ sw $v0, ($a0) -/* 428CBC 802A924C 2402000A */ addiu $v0, $zero, 0xa -/* 428CC0 802A9250 A622004C */ sh $v0, 0x4c($s1) -/* 428CC4 802A9254 0C09A446 */ jal func_80269118 -/* 428CC8 802A9258 A0830082 */ sb $v1, 0x82($a0) -/* 428CCC 802A925C 8FBF001C */ lw $ra, 0x1c($sp) -/* 428CD0 802A9260 8FB20018 */ lw $s2, 0x18($sp) -/* 428CD4 802A9264 8FB10014 */ lw $s1, 0x14($sp) -/* 428CD8 802A9268 8FB00010 */ lw $s0, 0x10($sp) -/* 428CDC 802A926C 24020002 */ addiu $v0, $zero, 2 -/* 428CE0 802A9270 03E00008 */ jr $ra -/* 428CE4 802A9274 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index 9a0e43a843..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A96EC_42915C -/* 42915C 802A96EC 3C02800E */ lui $v0, %hi(gBattleStatus+0x83) -/* 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(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) -/* 429180 802A9710 8E240004 */ lw $a0, 4($s1) -/* 429184 802A9714 0C0511EA */ jal draw_hud_element_clipped -/* 429188 802A9718 00000000 */ nop -.L802A971C: -/* 42918C 802A971C 8E300008 */ lw $s0, 8($s1) -/* 429190 802A9720 0C0511EA */ jal draw_hud_element_clipped -/* 429194 802A9724 0200202D */ daddu $a0, $s0, $zero -/* 429198 802A9728 0200202D */ daddu $a0, $s0, $zero -/* 42919C 802A972C 27A50010 */ addiu $a1, $sp, 0x10 -/* 4291A0 802A9730 0C05126B */ jal get_hud_element_render_pos -/* 4291A4 802A9734 27A60014 */ addiu $a2, $sp, 0x14 -/* 4291A8 802A9738 3C02802B */ lui $v0, %hi(action_command_smack_UnkActionCommandFunc1) -/* 4291AC 802A973C 8C4298B0 */ lw $v0, %lo(action_command_smack_UnkActionCommandFunc1)($v0) -/* 4291B0 802A9740 14400008 */ bnez $v0, .L802A9764 -/* 4291B4 802A9744 3C0451EB */ lui $a0, 0x51eb -/* 4291B8 802A9748 96230044 */ lhu $v1, 0x44($s1) -/* 4291BC 802A974C 3484851F */ ori $a0, $a0, 0x851f -/* 4291C0 802A9750 00031C00 */ sll $v1, $v1, 0x10 -/* 4291C4 802A9754 00031403 */ sra $v0, $v1, 0x10 -/* 4291C8 802A9758 00440018 */ mult $v0, $a0 -/* 4291CC 802A975C 080AA5E3 */ j .L802A978C -/* 4291D0 802A9760 24070001 */ addiu $a3, $zero, 1 -.L802A9764: -/* 4291D4 802A9764 86220068 */ lh $v0, 0x68($s1) -/* 4291D8 802A9768 14400013 */ bnez $v0, .L802A97B8 -/* 4291DC 802A976C 3484851F */ ori $a0, $a0, 0x851f -/* 4291E0 802A9770 3C0451EB */ lui $a0, 0x51eb -/* 4291E4 802A9774 96230044 */ lhu $v1, 0x44($s1) -/* 4291E8 802A9778 3484851F */ ori $a0, $a0, 0x851f -/* 4291EC 802A977C 00031C00 */ sll $v1, $v1, 0x10 -/* 4291F0 802A9780 00031403 */ sra $v0, $v1, 0x10 -/* 4291F4 802A9784 00440018 */ mult $v0, $a0 -/* 4291F8 802A9788 24070004 */ addiu $a3, $zero, 4 -.L802A978C: -/* 4291FC 802A978C 8FA50014 */ lw $a1, 0x14($sp) -/* 429200 802A9790 00031FC3 */ sra $v1, $v1, 0x1f -/* 429204 802A9794 8FA40010 */ lw $a0, 0x10($sp) -/* 429208 802A9798 00004010 */ mfhi $t0 -/* 42920C 802A979C 00083143 */ sra $a2, $t0, 5 -/* 429210 802A97A0 00C33023 */ subu $a2, $a2, $v1 -/* 429214 802A97A4 00063400 */ sll $a2, $a2, 0x10 -/* 429218 802A97A8 0C09A1E6 */ jal func_80268798 -/* 42921C 802A97AC 00063403 */ sra $a2, $a2, 0x10 -/* 429220 802A97B0 080AA5FC */ j .L802A97F0 -/* 429224 802A97B4 00000000 */ nop -.L802A97B8: -/* 429228 802A97B8 96230044 */ lhu $v1, 0x44($s1) -/* 42922C 802A97BC 00031C00 */ sll $v1, $v1, 0x10 -/* 429230 802A97C0 00031403 */ sra $v0, $v1, 0x10 -/* 429234 802A97C4 00440018 */ mult $v0, $a0 -/* 429238 802A97C8 24070004 */ addiu $a3, $zero, 4 -/* 42923C 802A97CC 8FA50014 */ lw $a1, 0x14($sp) -/* 429240 802A97D0 00031FC3 */ sra $v1, $v1, 0x1f -/* 429244 802A97D4 8FA40010 */ lw $a0, 0x10($sp) -/* 429248 802A97D8 00004010 */ mfhi $t0 -/* 42924C 802A97DC 00083143 */ sra $a2, $t0, 5 -/* 429250 802A97E0 00C33023 */ subu $a2, $a2, $v1 -/* 429254 802A97E4 00063400 */ sll $a2, $a2, 0x10 -/* 429258 802A97E8 0C09A20D */ jal func_80268834 -/* 42925C 802A97EC 00063403 */ sra $a2, $a2, 0x10 -.L802A97F0: -/* 429260 802A97F0 8E24000C */ lw $a0, 0xc($s1) -/* 429264 802A97F4 0C0511EA */ jal draw_hud_element_clipped -/* 429268 802A97F8 00000000 */ nop -/* 42926C 802A97FC 8FBF0020 */ lw $ra, 0x20($sp) -/* 429270 802A9800 8FB1001C */ lw $s1, 0x1c($sp) -/* 429274 802A9804 8FB00018 */ lw $s0, 0x18($sp) -/* 429278 802A9808 03E00008 */ jr $ra -/* 42927C 802A980C 27BD0028 */ addiu $sp, $sp, 0x28 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 deleted file mode 100644 index 7d752e3777..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A9000_429320.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_429320 -/* 429320 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 429324 802A9004 AFB00010 */ sw $s0, 0x10($sp) -/* 429328 802A9008 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 42932C 802A900C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 429330 802A9010 24020064 */ addiu $v0, $zero, 0x64 -/* 429334 802A9014 AFBF0018 */ sw $ra, 0x18($sp) -/* 429338 802A9018 AFB10014 */ sw $s1, 0x14($sp) -/* 42933C 802A901C A2020082 */ sb $v0, 0x82($s0) -/* 429340 802A9020 3C028029 */ lui $v0, %hi(D_80294360) -/* 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(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 -/* 429364 802A9044 0200182D */ daddu $v1, $s0, $zero -/* 429368 802A9048 0C09A216 */ jal func_80268858 -/* 42936C 802A904C 00000000 */ nop -/* 429370 802A9050 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 429374 802A9054 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) -/* 429378 802A9058 2402000E */ addiu $v0, $zero, 0xe -/* 42937C 802A905C A622004A */ sh $v0, 0x4a($s1) -/* 429380 802A9060 24020001 */ addiu $v0, $zero, 1 -/* 429384 802A9064 A2220061 */ sb $v0, 0x61($s1) -/* 429388 802A9068 2402001E */ addiu $v0, $zero, 0x1e -/* 42938C 802A906C A622006C */ sh $v0, 0x6c($s1) -/* 429390 802A9070 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 429394 802A9074 A620004C */ sh $zero, 0x4c($s1) -/* 429398 802A9078 A2200060 */ sb $zero, 0x60($s1) -/* 42939C 802A907C A6200044 */ sh $zero, 0x44($s1) -/* 4293A0 802A9080 A6200048 */ sh $zero, 0x48($s1) -/* 4293A4 802A9084 A6200068 */ sh $zero, 0x68($s1) -/* 4293A8 802A9088 A2000081 */ sb $zero, 0x81($s0) -/* 4293AC 802A908C A6220056 */ sh $v0, 0x56($s1) -/* 4293B0 802A9090 24020050 */ addiu $v0, $zero, 0x50 -/* 4293B4 802A9094 0C050529 */ jal create_hud_element -/* 4293B8 802A9098 A6220058 */ sh $v0, 0x58($s1) -/* 4293BC 802A909C 0040802D */ daddu $s0, $v0, $zero -/* 4293C0 802A90A0 86250056 */ lh $a1, 0x56($s1) -/* 4293C4 802A90A4 86260058 */ lh $a2, 0x58($s1) -/* 4293C8 802A90A8 0200202D */ daddu $a0, $s0, $zero -/* 4293CC 802A90AC 0C051261 */ jal set_hud_element_render_pos -/* 4293D0 802A90B0 AE300004 */ sw $s0, 4($s1) -/* 4293D4 802A90B4 0200202D */ daddu $a0, $s0, $zero -/* 4293D8 802A90B8 0C051277 */ jal set_hud_element_render_depth -/* 4293DC 802A90BC 0000282D */ daddu $a1, $zero, $zero -/* 4293E0 802A90C0 0200202D */ daddu $a0, $s0, $zero -/* 4293E4 802A90C4 0C051280 */ jal set_hud_element_flags -/* 4293E8 802A90C8 24050082 */ addiu $a1, $zero, 0x82 -/* 4293EC 802A90CC 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 4293F0 802A90D0 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) -/* 4293F4 802A90D4 0C050529 */ jal create_hud_element -/* 4293F8 802A90D8 00000000 */ nop -/* 4293FC 802A90DC 0040802D */ daddu $s0, $v0, $zero -/* 429400 802A90E0 86250056 */ lh $a1, 0x56($s1) -/* 429404 802A90E4 86260058 */ lh $a2, 0x58($s1) -/* 429408 802A90E8 0200202D */ daddu $a0, $s0, $zero -/* 42940C 802A90EC AE300008 */ sw $s0, 8($s1) -/* 429410 802A90F0 0C051261 */ jal set_hud_element_render_pos -/* 429414 802A90F4 24C6001C */ addiu $a2, $a2, 0x1c -/* 429418 802A90F8 0200202D */ daddu $a0, $s0, $zero -/* 42941C 802A90FC 0C051277 */ jal set_hud_element_render_depth -/* 429420 802A9100 0000282D */ daddu $a1, $zero, $zero -/* 429424 802A9104 0200202D */ daddu $a0, $s0, $zero -/* 429428 802A9108 0C051280 */ jal set_hud_element_flags -/* 42942C 802A910C 24050082 */ addiu $a1, $zero, 0x82 -/* 429430 802A9110 3C048029 */ lui $a0, %hi(D_80292974) -/* 429434 802A9114 24842974 */ addiu $a0, $a0, %lo(D_80292974) -/* 429438 802A9118 0C050529 */ jal create_hud_element -/* 42943C 802A911C 00000000 */ nop -/* 429440 802A9120 0040802D */ daddu $s0, $v0, $zero -/* 429444 802A9124 86250056 */ lh $a1, 0x56($s1) -/* 429448 802A9128 86260058 */ lh $a2, 0x58($s1) -/* 42944C 802A912C 0200202D */ daddu $a0, $s0, $zero -/* 429450 802A9130 AE30000C */ sw $s0, 0xc($s1) -/* 429454 802A9134 0C051261 */ jal set_hud_element_render_pos -/* 429458 802A9138 24C6001C */ addiu $a2, $a2, 0x1c -/* 42945C 802A913C 0200202D */ daddu $a0, $s0, $zero -/* 429460 802A9140 0C051277 */ jal set_hud_element_render_depth -/* 429464 802A9144 0000282D */ daddu $a1, $zero, $zero -/* 429468 802A9148 0200202D */ daddu $a0, $s0, $zero -/* 42946C 802A914C 0C051280 */ jal set_hud_element_flags -/* 429470 802A9150 24050082 */ addiu $a1, $zero, 0x82 -/* 429474 802A9154 080AA459 */ j .L802A9164 -/* 429478 802A9158 24020002 */ addiu $v0, $zero, 2 -.L802A915C: -/* 42947C 802A915C A0600081 */ sb $zero, 0x81($v1) -/* 429480 802A9160 24020002 */ addiu $v0, $zero, 2 -.L802A9164: -/* 429484 802A9164 8FBF0018 */ lw $ra, 0x18($sp) -/* 429488 802A9168 8FB10014 */ lw $s1, 0x14($sp) -/* 42948C 802A916C 8FB00010 */ lw $s0, 0x10($sp) -/* 429490 802A9170 03E00008 */ jr $ra -/* 429494 802A9174 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index f63ec748ae..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A91B0_4235A0.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A91B0_4235A0 -/* 4235A0 802A91B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 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(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) -/* 4235C4 802A91D4 AFBF0020 */ sw $ra, 0x20($sp) -/* 4235C8 802A91D8 AFB00010 */ sw $s0, 0x10($sp) -/* 4235CC 802A91DC 82620083 */ lb $v0, 0x83($s3) -/* 4235D0 802A91E0 8E50000C */ lw $s0, 0xc($s2) -/* 4235D4 802A91E4 10400034 */ beqz $v0, .L802A92B8 -/* 4235D8 802A91E8 0260182D */ daddu $v1, $s3, $zero -/* 4235DC 802A91EC 0C09A216 */ jal func_80268858 -/* 4235E0 802A91F0 00000000 */ nop -/* 4235E4 802A91F4 8E050000 */ lw $a1, ($s0) -/* 4235E8 802A91F8 26100004 */ addiu $s0, $s0, 4 -/* 4235EC 802A91FC 0C0B1EAF */ jal evt_get_variable -/* 4235F0 802A9200 0240202D */ daddu $a0, $s2, $zero -/* 4235F4 802A9204 A622004E */ sh $v0, 0x4e($s1) -/* 4235F8 802A9208 8E050000 */ lw $a1, ($s0) -/* 4235FC 802A920C 26100004 */ addiu $s0, $s0, 4 -/* 423600 802A9210 0C0B1EAF */ jal evt_get_variable -/* 423604 802A9214 0240202D */ daddu $a0, $s2, $zero -/* 423608 802A9218 A6220052 */ sh $v0, 0x52($s1) -/* 42360C 802A921C 8E050000 */ lw $a1, ($s0) -/* 423610 802A9220 26100004 */ addiu $s0, $s0, 4 -/* 423614 802A9224 0C0B1EAF */ jal evt_get_variable -/* 423618 802A9228 0240202D */ daddu $a0, $s2, $zero -/* 42361C 802A922C A622005A */ sh $v0, 0x5a($s1) -/* 423620 802A9230 8E050000 */ lw $a1, ($s0) -/* 423624 802A9234 0C0B1EAF */ jal evt_get_variable -/* 423628 802A9238 0240202D */ daddu $a0, $s2, $zero -/* 42362C 802A923C 00022400 */ sll $a0, $v0, 0x10 -/* 423630 802A9240 00042403 */ sra $a0, $a0, 0x10 -/* 423634 802A9244 0C09A089 */ jal func_80268224 -/* 423638 802A9248 A6220050 */ sh $v0, 0x50($s1) -/* 42363C 802A924C 8624005A */ lh $a0, 0x5a($s1) -/* 423640 802A9250 A6220050 */ sh $v0, 0x50($s1) -/* 423644 802A9254 A2200060 */ sb $zero, 0x60($s1) -/* 423648 802A9258 A6200044 */ sh $zero, 0x44($s1) -/* 42364C 802A925C A6200046 */ sh $zero, 0x46($s1) -/* 423650 802A9260 A6200048 */ sh $zero, 0x48($s1) -/* 423654 802A9264 A2600081 */ sb $zero, 0x81($s3) -/* 423658 802A9268 82220080 */ lb $v0, 0x80($s1) -/* 42365C 802A926C 2403007F */ addiu $v1, $zero, 0x7f -/* 423660 802A9270 A2630086 */ sb $v1, 0x86($s3) -/* 423664 802A9274 2442FFFF */ addiu $v0, $v0, -1 -/* 423668 802A9278 00021040 */ sll $v0, $v0, 1 -/* 42366C 802A927C 00511021 */ addu $v0, $v0, $s1 -/* 423670 802A9280 90420075 */ lbu $v0, 0x75($v0) -/* 423674 802A9284 0C00A67F */ jal rand_int -/* 423678 802A9288 A2620082 */ sb $v0, 0x82($s3) -/* 42367C 802A928C 3C05FFFF */ lui $a1, 0xffff -/* 423680 802A9290 34A57FFF */ ori $a1, $a1, 0x7fff -/* 423684 802A9294 A6220046 */ sh $v0, 0x46($s1) -/* 423688 802A9298 24020002 */ addiu $v0, $zero, 2 -/* 42368C 802A929C A220005C */ sb $zero, 0x5c($s1) -/* 423690 802A92A0 8E630000 */ lw $v1, ($s3) -/* 423694 802A92A4 2404000A */ addiu $a0, $zero, 0xa -/* 423698 802A92A8 A624004C */ sh $a0, 0x4c($s1) -/* 42369C 802A92AC 00651824 */ and $v1, $v1, $a1 -/* 4236A0 802A92B0 080AA4B0 */ j .L802A92C0 -/* 4236A4 802A92B4 AE630000 */ sw $v1, ($s3) -.L802A92B8: -/* 4236A8 802A92B8 A0600081 */ sb $zero, 0x81($v1) -/* 4236AC 802A92BC 24020002 */ addiu $v0, $zero, 2 -.L802A92C0: -/* 4236B0 802A92C0 8FBF0020 */ lw $ra, 0x20($sp) -/* 4236B4 802A92C4 8FB3001C */ lw $s3, 0x1c($sp) -/* 4236B8 802A92C8 8FB20018 */ lw $s2, 0x18($sp) -/* 4236BC 802A92CC 8FB10014 */ lw $s1, 0x14($sp) -/* 4236C0 802A92D0 8FB00010 */ lw $s0, 0x10($sp) -/* 4236C4 802A92D4 03E00008 */ jr $ra -/* 4236C8 802A92D8 27BD0028 */ addiu $sp, $sp, 0x28 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 deleted file mode 100644 index fe045d1835..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/break_free/func_802A96B8_423AA8.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A96B8_423AA8 -/* 423AA8 802A96B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 423AAC 802A96BC AFB00018 */ sw $s0, 0x18($sp) -/* 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) -/* 423AC4 802A96D4 86030046 */ lh $v1, 0x46($s0) -/* 423AC8 802A96D8 00021040 */ sll $v0, $v0, 1 -/* 423ACC 802A96DC 00501021 */ addu $v0, $v0, $s0 -/* 423AD0 802A96E0 84440074 */ lh $a0, 0x74($v0) -/* 423AD4 802A96E4 00831823 */ subu $v1, $a0, $v1 -/* 423AD8 802A96E8 00031100 */ sll $v0, $v1, 4 -/* 423ADC 802A96EC 00431023 */ subu $v0, $v0, $v1 -/* 423AE0 802A96F0 00021080 */ sll $v0, $v0, 2 -/* 423AE4 802A96F4 14800002 */ bnez $a0, .L802A9700 -/* 423AE8 802A96F8 0044001A */ div $zero, $v0, $a0 -/* 423AEC 802A96FC 0007000D */ break 7 -.L802A9700: -/* 423AF0 802A9700 2401FFFF */ addiu $at, $zero, -1 -/* 423AF4 802A9704 14810004 */ bne $a0, $at, .L802A9718 -/* 423AF8 802A9708 3C018000 */ lui $at, 0x8000 -/* 423AFC 802A970C 14410002 */ bne $v0, $at, .L802A9718 -/* 423B00 802A9710 00000000 */ nop -/* 423B04 802A9714 0006000D */ break 6 -.L802A9718: -/* 423B08 802A9718 00001012 */ mflo $v0 -/* 423B0C 802A971C 86060058 */ lh $a2, 0x58($s0) -/* 423B10 802A9720 24C60011 */ addiu $a2, $a2, 0x11 -/* 423B14 802A9724 2403003C */ addiu $v1, $zero, 0x3c -/* 423B18 802A9728 8E040010 */ lw $a0, 0x10($s0) -/* 423B1C 802A972C 00621823 */ subu $v1, $v1, $v0 -/* 423B20 802A9730 86020056 */ lh $v0, 0x56($s0) -/* 423B24 802A9734 2465FFE1 */ addiu $a1, $v1, -0x1f -/* 423B28 802A9738 AFA30010 */ sw $v1, 0x10($sp) -/* 423B2C 802A973C 0C051261 */ jal set_hud_element_render_pos -/* 423B30 802A9740 00452823 */ subu $a1, $v0, $a1 -/* 423B34 802A9744 8FA50010 */ lw $a1, 0x10($sp) -/* 423B38 802A9748 8E04000C */ lw $a0, 0xc($s0) -/* 423B3C 802A974C 86020056 */ lh $v0, 0x56($s0) -/* 423B40 802A9750 86060058 */ lh $a2, 0x58($s0) -/* 423B44 802A9754 24A5FFE1 */ addiu $a1, $a1, -0x1f -/* 423B48 802A9758 00452823 */ subu $a1, $v0, $a1 -/* 423B4C 802A975C 0C051261 */ jal set_hud_element_render_pos -/* 423B50 802A9760 24C6FFFF */ addiu $a2, $a2, -1 -/* 423B54 802A9764 8602006A */ lh $v0, 0x6a($s0) -/* 423B58 802A9768 14400004 */ bnez $v0, .L802A977C -/* 423B5C 802A976C 0200882D */ daddu $s1, $s0, $zero -/* 423B60 802A9770 8E040004 */ lw $a0, 4($s0) -/* 423B64 802A9774 0C0511EA */ jal draw_hud_element_clipped -/* 423B68 802A9778 00000000 */ nop -.L802A977C: -/* 423B6C 802A977C 8E300008 */ lw $s0, 8($s1) -/* 423B70 802A9780 0C0511EA */ jal draw_hud_element_clipped -/* 423B74 802A9784 0200202D */ daddu $a0, $s0, $zero -/* 423B78 802A9788 0200202D */ daddu $a0, $s0, $zero -/* 423B7C 802A978C 27A50010 */ addiu $a1, $sp, 0x10 -/* 423B80 802A9790 0C05126B */ jal get_hud_element_render_pos -/* 423B84 802A9794 27A60014 */ addiu $a2, $sp, 0x14 -/* 423B88 802A9798 3C0451EB */ lui $a0, 0x51eb -/* 423B8C 802A979C 96230044 */ lhu $v1, 0x44($s1) -/* 423B90 802A97A0 3484851F */ ori $a0, $a0, 0x851f -/* 423B94 802A97A4 00031C00 */ sll $v1, $v1, 0x10 -/* 423B98 802A97A8 00031403 */ sra $v0, $v1, 0x10 -/* 423B9C 802A97AC 00440018 */ mult $v0, $a0 -/* 423BA0 802A97B0 8FA50014 */ lw $a1, 0x14($sp) -/* 423BA4 802A97B4 00031FC3 */ sra $v1, $v1, 0x1f -/* 423BA8 802A97B8 8FA40010 */ lw $a0, 0x10($sp) -/* 423BAC 802A97BC 00003810 */ mfhi $a3 -/* 423BB0 802A97C0 00073143 */ sra $a2, $a3, 5 -/* 423BB4 802A97C4 00C33023 */ subu $a2, $a2, $v1 -/* 423BB8 802A97C8 00063400 */ sll $a2, $a2, 0x10 -/* 423BBC 802A97CC 0C09A1DC */ jal func_80268770 -/* 423BC0 802A97D0 00063403 */ sra $a2, $a2, 0x10 -/* 423BC4 802A97D4 8E24000C */ lw $a0, 0xc($s1) -/* 423BC8 802A97D8 0C0511EA */ jal draw_hud_element_clipped -/* 423BCC 802A97DC 00000000 */ nop -/* 423BD0 802A97E0 0C0511EA */ jal draw_hud_element_clipped -/* 423BD4 802A97E4 8E240010 */ lw $a0, 0x10($s1) -/* 423BD8 802A97E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 423BDC 802A97EC 8FB1001C */ lw $s1, 0x1c($sp) -/* 423BE0 802A97F0 8FB00018 */ lw $s0, 0x18($sp) -/* 423BE4 802A97F4 03E00008 */ jr $ra -/* 423BE8 802A97F8 27BD0028 */ addiu $sp, $sp, 0x28 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 deleted file mode 100644 index 4372984fbe..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A9000_426170.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_426170 -/* 426170 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 426174 802A9004 AFB00010 */ sw $s0, 0x10($sp) -/* 426178 802A9008 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 42617C 802A900C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 426180 802A9010 24020064 */ addiu $v0, $zero, 0x64 -/* 426184 802A9014 AFBF0018 */ sw $ra, 0x18($sp) -/* 426188 802A9018 AFB10014 */ sw $s1, 0x14($sp) -/* 42618C 802A901C A2020082 */ sb $v0, 0x82($s0) -/* 426190 802A9020 3C028029 */ lui $v0, %hi(D_802942A0) -/* 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(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 -/* 4261B4 802A9044 0200182D */ daddu $v1, $s0, $zero -/* 4261B8 802A9048 0C09A216 */ jal func_80268858 -/* 4261BC 802A904C 00000000 */ nop -/* 4261C0 802A9050 3C048011 */ lui $a0, %hi(D_80108B28) -/* 4261C4 802A9054 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) -/* 4261C8 802A9058 24020008 */ addiu $v0, $zero, 8 -/* 4261CC 802A905C A622004A */ sh $v0, 0x4a($s1) -/* 4261D0 802A9060 24020001 */ addiu $v0, $zero, 1 -/* 4261D4 802A9064 A2220061 */ sb $v0, 0x61($s1) -/* 4261D8 802A9068 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 4261DC 802A906C A620004C */ sh $zero, 0x4c($s1) -/* 4261E0 802A9070 A2200060 */ sb $zero, 0x60($s1) -/* 4261E4 802A9074 A6200044 */ sh $zero, 0x44($s1) -/* 4261E8 802A9078 A6200048 */ sh $zero, 0x48($s1) -/* 4261EC 802A907C A6200068 */ sh $zero, 0x68($s1) -/* 4261F0 802A9080 A2000081 */ sb $zero, 0x81($s0) -/* 4261F4 802A9084 A6220056 */ sh $v0, 0x56($s1) -/* 4261F8 802A9088 24020050 */ addiu $v0, $zero, 0x50 -/* 4261FC 802A908C 0C050529 */ jal create_hud_element -/* 426200 802A9090 A6220058 */ sh $v0, 0x58($s1) -/* 426204 802A9094 0040802D */ daddu $s0, $v0, $zero -/* 426208 802A9098 86250056 */ lh $a1, 0x56($s1) -/* 42620C 802A909C 86260058 */ lh $a2, 0x58($s1) -/* 426210 802A90A0 0200202D */ daddu $a0, $s0, $zero -/* 426214 802A90A4 0C051261 */ jal set_hud_element_render_pos -/* 426218 802A90A8 AE300004 */ sw $s0, 4($s1) -/* 42621C 802A90AC 0200202D */ daddu $a0, $s0, $zero -/* 426220 802A90B0 0C051277 */ jal set_hud_element_render_depth -/* 426224 802A90B4 0000282D */ daddu $a1, $zero, $zero -/* 426228 802A90B8 0200202D */ daddu $a0, $s0, $zero -/* 42622C 802A90BC 0C051280 */ jal set_hud_element_flags -/* 426230 802A90C0 24050082 */ addiu $a1, $zero, 0x82 -/* 426234 802A90C4 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 426238 802A90C8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) -/* 42623C 802A90CC 0C050529 */ jal create_hud_element -/* 426240 802A90D0 00000000 */ nop -/* 426244 802A90D4 0040802D */ daddu $s0, $v0, $zero -/* 426248 802A90D8 86250056 */ lh $a1, 0x56($s1) -/* 42624C 802A90DC 86260058 */ lh $a2, 0x58($s1) -/* 426250 802A90E0 0200202D */ daddu $a0, $s0, $zero -/* 426254 802A90E4 AE300008 */ sw $s0, 8($s1) -/* 426258 802A90E8 0C051261 */ jal set_hud_element_render_pos -/* 42625C 802A90EC 24C6001C */ addiu $a2, $a2, 0x1c -/* 426260 802A90F0 0200202D */ daddu $a0, $s0, $zero -/* 426264 802A90F4 0C051277 */ jal set_hud_element_render_depth -/* 426268 802A90F8 0000282D */ daddu $a1, $zero, $zero -/* 42626C 802A90FC 0200202D */ daddu $a0, $s0, $zero -/* 426270 802A9100 0C051280 */ jal set_hud_element_flags -/* 426274 802A9104 24050082 */ addiu $a1, $zero, 0x82 -/* 426278 802A9108 3C048029 */ lui $a0, %hi(D_80292974) -/* 42627C 802A910C 24842974 */ addiu $a0, $a0, %lo(D_80292974) -/* 426280 802A9110 0C050529 */ jal create_hud_element -/* 426284 802A9114 00000000 */ nop -/* 426288 802A9118 0040802D */ daddu $s0, $v0, $zero -/* 42628C 802A911C 86250056 */ lh $a1, 0x56($s1) -/* 426290 802A9120 86260058 */ lh $a2, 0x58($s1) -/* 426294 802A9124 0200202D */ daddu $a0, $s0, $zero -/* 426298 802A9128 AE30000C */ sw $s0, 0xc($s1) -/* 42629C 802A912C 0C051261 */ jal set_hud_element_render_pos -/* 4262A0 802A9130 24C6001C */ addiu $a2, $a2, 0x1c -/* 4262A4 802A9134 0200202D */ daddu $a0, $s0, $zero -/* 4262A8 802A9138 0C051277 */ jal set_hud_element_render_depth -/* 4262AC 802A913C 0000282D */ daddu $a1, $zero, $zero -/* 4262B0 802A9140 0200202D */ daddu $a0, $s0, $zero -/* 4262B4 802A9144 0C051280 */ jal set_hud_element_flags -/* 4262B8 802A9148 24050082 */ addiu $a1, $zero, 0x82 -/* 4262BC 802A914C 080AA457 */ j .L802A915C -/* 4262C0 802A9150 24020002 */ addiu $v0, $zero, 2 -.L802A9154: -/* 4262C4 802A9154 A0600081 */ sb $zero, 0x81($v1) -/* 4262C8 802A9158 24020002 */ addiu $v0, $zero, 2 -.L802A915C: -/* 4262CC 802A915C 8FBF0018 */ lw $ra, 0x18($sp) -/* 4262D0 802A9160 8FB10014 */ lw $s1, 0x14($sp) -/* 4262D4 802A9164 8FB00010 */ lw $s0, 0x10($sp) -/* 4262D8 802A9168 03E00008 */ jr $ra -/* 4262DC 802A916C 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index 46158cb577..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9000_4269D0.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_4269D0 -/* 4269D0 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 4269D4 802A9004 AFB00010 */ sw $s0, 0x10($sp) -/* 4269D8 802A9008 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 4269DC 802A900C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 4269E0 802A9010 24020064 */ addiu $v0, $zero, 0x64 -/* 4269E4 802A9014 AFBF0018 */ sw $ra, 0x18($sp) -/* 4269E8 802A9018 AFB10014 */ sw $s1, 0x14($sp) -/* 4269EC 802A901C A2020082 */ sb $v0, 0x82($s0) -/* 4269F0 802A9020 3C028029 */ lui $v0, %hi(D_802942C0) -/* 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(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 -/* 426A14 802A9044 0200182D */ daddu $v1, $s0, $zero -/* 426A18 802A9048 0C09A216 */ jal func_80268858 -/* 426A1C 802A904C 00000000 */ nop -/* 426A20 802A9050 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 426A24 802A9054 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) -/* 426A28 802A9058 24020009 */ addiu $v0, $zero, 9 -/* 426A2C 802A905C A622004A */ sh $v0, 0x4a($s1) -/* 426A30 802A9060 24020001 */ addiu $v0, $zero, 1 -/* 426A34 802A9064 A2220061 */ sb $v0, 0x61($s1) -/* 426A38 802A9068 2402001E */ addiu $v0, $zero, 0x1e -/* 426A3C 802A906C A622006C */ sh $v0, 0x6c($s1) -/* 426A40 802A9070 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 426A44 802A9074 A620004C */ sh $zero, 0x4c($s1) -/* 426A48 802A9078 A2200060 */ sb $zero, 0x60($s1) -/* 426A4C 802A907C A6200044 */ sh $zero, 0x44($s1) -/* 426A50 802A9080 A6200048 */ sh $zero, 0x48($s1) -/* 426A54 802A9084 A6200068 */ sh $zero, 0x68($s1) -/* 426A58 802A9088 A2000081 */ sb $zero, 0x81($s0) -/* 426A5C 802A908C A6220056 */ sh $v0, 0x56($s1) -/* 426A60 802A9090 24020050 */ addiu $v0, $zero, 0x50 -/* 426A64 802A9094 0C050529 */ jal create_hud_element -/* 426A68 802A9098 A6220058 */ sh $v0, 0x58($s1) -/* 426A6C 802A909C 0040802D */ daddu $s0, $v0, $zero -/* 426A70 802A90A0 86250056 */ lh $a1, 0x56($s1) -/* 426A74 802A90A4 86260058 */ lh $a2, 0x58($s1) -/* 426A78 802A90A8 0200202D */ daddu $a0, $s0, $zero -/* 426A7C 802A90AC 0C051261 */ jal set_hud_element_render_pos -/* 426A80 802A90B0 AE300004 */ sw $s0, 4($s1) -/* 426A84 802A90B4 0200202D */ daddu $a0, $s0, $zero -/* 426A88 802A90B8 0C051277 */ jal set_hud_element_render_depth -/* 426A8C 802A90BC 0000282D */ daddu $a1, $zero, $zero -/* 426A90 802A90C0 0200202D */ daddu $a0, $s0, $zero -/* 426A94 802A90C4 0C051280 */ jal set_hud_element_flags -/* 426A98 802A90C8 24050082 */ addiu $a1, $zero, 0x82 -/* 426A9C 802A90CC 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 426AA0 802A90D0 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) -/* 426AA4 802A90D4 0C050529 */ jal create_hud_element -/* 426AA8 802A90D8 00000000 */ nop -/* 426AAC 802A90DC 0040802D */ daddu $s0, $v0, $zero -/* 426AB0 802A90E0 86250056 */ lh $a1, 0x56($s1) -/* 426AB4 802A90E4 86260058 */ lh $a2, 0x58($s1) -/* 426AB8 802A90E8 0200202D */ daddu $a0, $s0, $zero -/* 426ABC 802A90EC AE300008 */ sw $s0, 8($s1) -/* 426AC0 802A90F0 0C051261 */ jal set_hud_element_render_pos -/* 426AC4 802A90F4 24C6001C */ addiu $a2, $a2, 0x1c -/* 426AC8 802A90F8 0200202D */ daddu $a0, $s0, $zero -/* 426ACC 802A90FC 0C051277 */ jal set_hud_element_render_depth -/* 426AD0 802A9100 0000282D */ daddu $a1, $zero, $zero -/* 426AD4 802A9104 0200202D */ daddu $a0, $s0, $zero -/* 426AD8 802A9108 0C051280 */ jal set_hud_element_flags -/* 426ADC 802A910C 24050082 */ addiu $a1, $zero, 0x82 -/* 426AE0 802A9110 3C048029 */ lui $a0, %hi(D_80292974) -/* 426AE4 802A9114 24842974 */ addiu $a0, $a0, %lo(D_80292974) -/* 426AE8 802A9118 0C050529 */ jal create_hud_element -/* 426AEC 802A911C 00000000 */ nop -/* 426AF0 802A9120 0040802D */ daddu $s0, $v0, $zero -/* 426AF4 802A9124 86250056 */ lh $a1, 0x56($s1) -/* 426AF8 802A9128 86260058 */ lh $a2, 0x58($s1) -/* 426AFC 802A912C 0200202D */ daddu $a0, $s0, $zero -/* 426B00 802A9130 AE30000C */ sw $s0, 0xc($s1) -/* 426B04 802A9134 0C051261 */ jal set_hud_element_render_pos -/* 426B08 802A9138 24C6001C */ addiu $a2, $a2, 0x1c -/* 426B0C 802A913C 0200202D */ daddu $a0, $s0, $zero -/* 426B10 802A9140 0C051277 */ jal set_hud_element_render_depth -/* 426B14 802A9144 0000282D */ daddu $a1, $zero, $zero -/* 426B18 802A9148 0200202D */ daddu $a0, $s0, $zero -/* 426B1C 802A914C 0C051280 */ jal set_hud_element_flags -/* 426B20 802A9150 24050082 */ addiu $a1, $zero, 0x82 -/* 426B24 802A9154 080AA459 */ j .L802A9164 -/* 426B28 802A9158 24020002 */ addiu $v0, $zero, 2 -.L802A915C: -/* 426B2C 802A915C A0600081 */ sb $zero, 0x81($v1) -/* 426B30 802A9160 24020002 */ addiu $v0, $zero, 2 -.L802A9164: -/* 426B34 802A9164 8FBF0018 */ lw $ra, 0x18($sp) -/* 426B38 802A9168 8FB10014 */ lw $s1, 0x14($sp) -/* 426B3C 802A916C 8FB00010 */ lw $s0, 0x10($sp) -/* 426B40 802A9170 03E00008 */ jr $ra -/* 426B44 802A9174 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index 6bf494dea0..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9000_42F6E0.s +++ /dev/null @@ -1,110 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_42F6E0 -/* 42F6E0 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 42F6E4 802A9004 3C03800E */ lui $v1, %hi(gBattleStatus) -/* 42F6E8 802A9008 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) -/* 42F6EC 802A900C 24020005 */ addiu $v0, $zero, 5 -/* 42F6F0 802A9010 AFBF0018 */ sw $ra, 0x18($sp) -/* 42F6F4 802A9014 AFB10014 */ sw $s1, 0x14($sp) -/* 42F6F8 802A9018 AFB00010 */ sw $s0, 0x10($sp) -/* 42F6FC 802A901C A0620082 */ sb $v0, 0x82($v1) -/* 42F700 802A9020 3C028029 */ lui $v0, %hi(D_80294420) -/* 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(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 -/* 42F724 802A9044 00000000 */ nop -/* 42F728 802A9048 3C048011 */ lui $a0, %hi(D_80108B28) -/* 42F72C 802A904C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) -/* 42F730 802A9050 24020014 */ addiu $v0, $zero, 0x14 -/* 42F734 802A9054 A622004A */ sh $v0, 0x4a($s1) -/* 42F738 802A9058 2402001E */ addiu $v0, $zero, 0x1e -/* 42F73C 802A905C A622006C */ sh $v0, 0x6c($s1) -/* 42F740 802A9060 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 42F744 802A9064 A6220056 */ sh $v0, 0x56($s1) -/* 42F748 802A9068 24020050 */ addiu $v0, $zero, 0x50 -/* 42F74C 802A906C A620004C */ sh $zero, 0x4c($s1) -/* 42F750 802A9070 A2200060 */ sb $zero, 0x60($s1) -/* 42F754 802A9074 A6200044 */ sh $zero, 0x44($s1) -/* 42F758 802A9078 A6200048 */ sh $zero, 0x48($s1) -/* 42F75C 802A907C A6200068 */ sh $zero, 0x68($s1) -/* 42F760 802A9080 0C050529 */ jal create_hud_element -/* 42F764 802A9084 A6220058 */ sh $v0, 0x58($s1) -/* 42F768 802A9088 0040802D */ daddu $s0, $v0, $zero -/* 42F76C 802A908C 0200202D */ daddu $a0, $s0, $zero -/* 42F770 802A9090 24050082 */ addiu $a1, $zero, 0x82 -/* 42F774 802A9094 0C051280 */ jal set_hud_element_flags -/* 42F778 802A9098 AE300004 */ sw $s0, 4($s1) -/* 42F77C 802A909C 86250056 */ lh $a1, 0x56($s1) -/* 42F780 802A90A0 86260058 */ lh $a2, 0x58($s1) -/* 42F784 802A90A4 0C051261 */ jal set_hud_element_render_pos -/* 42F788 802A90A8 0200202D */ daddu $a0, $s0, $zero -/* 42F78C 802A90AC 0200202D */ daddu $a0, $s0, $zero -/* 42F790 802A90B0 0C051277 */ jal set_hud_element_render_depth -/* 42F794 802A90B4 0000282D */ daddu $a1, $zero, $zero -/* 42F798 802A90B8 3C048029 */ lui $a0, %hi(D_8029231C) -/* 42F79C 802A90BC 2484231C */ addiu $a0, $a0, %lo(D_8029231C) -/* 42F7A0 802A90C0 0C050529 */ jal create_hud_element -/* 42F7A4 802A90C4 00000000 */ nop -/* 42F7A8 802A90C8 0040802D */ daddu $s0, $v0, $zero -/* 42F7AC 802A90CC 0200202D */ daddu $a0, $s0, $zero -/* 42F7B0 802A90D0 24050082 */ addiu $a1, $zero, 0x82 -/* 42F7B4 802A90D4 0C051280 */ jal set_hud_element_flags -/* 42F7B8 802A90D8 AE30000C */ sw $s0, 0xc($s1) -/* 42F7BC 802A90DC 86250056 */ lh $a1, 0x56($s1) -/* 42F7C0 802A90E0 86260058 */ lh $a2, 0x58($s1) -/* 42F7C4 802A90E4 0C051261 */ jal set_hud_element_render_pos -/* 42F7C8 802A90E8 0200202D */ daddu $a0, $s0, $zero -/* 42F7CC 802A90EC 0200202D */ daddu $a0, $s0, $zero -/* 42F7D0 802A90F0 0C051277 */ jal set_hud_element_render_depth -/* 42F7D4 802A90F4 0000282D */ daddu $a1, $zero, $zero -/* 42F7D8 802A90F8 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 42F7DC 802A90FC 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) -/* 42F7E0 802A9100 0C050529 */ jal create_hud_element -/* 42F7E4 802A9104 00000000 */ nop -/* 42F7E8 802A9108 0040802D */ daddu $s0, $v0, $zero -/* 42F7EC 802A910C 86250056 */ lh $a1, 0x56($s1) -/* 42F7F0 802A9110 86260058 */ lh $a2, 0x58($s1) -/* 42F7F4 802A9114 0200202D */ daddu $a0, $s0, $zero -/* 42F7F8 802A9118 AE300008 */ sw $s0, 8($s1) -/* 42F7FC 802A911C 0C051261 */ jal set_hud_element_render_pos -/* 42F800 802A9120 24C6001C */ addiu $a2, $a2, 0x1c -/* 42F804 802A9124 0200202D */ daddu $a0, $s0, $zero -/* 42F808 802A9128 0C051277 */ jal set_hud_element_render_depth -/* 42F80C 802A912C 0000282D */ daddu $a1, $zero, $zero -/* 42F810 802A9130 0200202D */ daddu $a0, $s0, $zero -/* 42F814 802A9134 0C051280 */ jal set_hud_element_flags -/* 42F818 802A9138 24050082 */ addiu $a1, $zero, 0x82 -/* 42F81C 802A913C 3C048029 */ lui $a0, %hi(D_80292974) -/* 42F820 802A9140 24842974 */ addiu $a0, $a0, %lo(D_80292974) -/* 42F824 802A9144 0C050529 */ jal create_hud_element -/* 42F828 802A9148 00000000 */ nop -/* 42F82C 802A914C 0040802D */ daddu $s0, $v0, $zero -/* 42F830 802A9150 86250056 */ lh $a1, 0x56($s1) -/* 42F834 802A9154 86260058 */ lh $a2, 0x58($s1) -/* 42F838 802A9158 0200202D */ daddu $a0, $s0, $zero -/* 42F83C 802A915C AE300014 */ sw $s0, 0x14($s1) -/* 42F840 802A9160 0C051261 */ jal set_hud_element_render_pos -/* 42F844 802A9164 24C6001C */ addiu $a2, $a2, 0x1c -/* 42F848 802A9168 0200202D */ daddu $a0, $s0, $zero -/* 42F84C 802A916C 0C051277 */ jal set_hud_element_render_depth -/* 42F850 802A9170 0000282D */ daddu $a1, $zero, $zero -/* 42F854 802A9174 0200202D */ daddu $a0, $s0, $zero -/* 42F858 802A9178 0C051280 */ jal set_hud_element_flags -/* 42F85C 802A917C 24050082 */ addiu $a1, $zero, 0x82 -/* 42F860 802A9180 080AA463 */ j .L802A918C -/* 42F864 802A9184 24020002 */ addiu $v0, $zero, 2 -.L802A9188: -/* 42F868 802A9188 24020002 */ addiu $v0, $zero, 2 -.L802A918C: -/* 42F86C 802A918C 8FBF0018 */ lw $ra, 0x18($sp) -/* 42F870 802A9190 8FB10014 */ lw $s1, 0x14($sp) -/* 42F874 802A9194 8FB00010 */ lw $s0, 0x10($sp) -/* 42F878 802A9198 03E00008 */ jr $ra -/* 42F87C 802A919C 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index 041f98f5b9..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A91A0_42F880.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A91A0_42F880 -/* 42F880 802A91A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 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(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) -/* 42F8A4 802A91C4 AFBF0020 */ sw $ra, 0x20($sp) -/* 42F8A8 802A91C8 AFB00010 */ sw $s0, 0x10($sp) -/* 42F8AC 802A91CC 82620083 */ lb $v0, 0x83($s3) -/* 42F8B0 802A91D0 8E50000C */ lw $s0, 0xc($s2) -/* 42F8B4 802A91D4 10400029 */ beqz $v0, .L802A927C -/* 42F8B8 802A91D8 0260182D */ daddu $v1, $s3, $zero -/* 42F8BC 802A91DC 0C09A216 */ jal func_80268858 -/* 42F8C0 802A91E0 00000000 */ nop -/* 42F8C4 802A91E4 8E050000 */ lw $a1, ($s0) -/* 42F8C8 802A91E8 26100004 */ addiu $s0, $s0, 4 -/* 42F8CC 802A91EC 0C0B1EAF */ jal evt_get_variable -/* 42F8D0 802A91F0 0240202D */ daddu $a0, $s2, $zero -/* 42F8D4 802A91F4 A622004E */ sh $v0, 0x4e($s1) -/* 42F8D8 802A91F8 8E050000 */ lw $a1, ($s0) -/* 42F8DC 802A91FC 26100004 */ addiu $s0, $s0, 4 -/* 42F8E0 802A9200 0C0B1EAF */ jal evt_get_variable -/* 42F8E4 802A9204 0240202D */ daddu $a0, $s2, $zero -/* 42F8E8 802A9208 A6220052 */ sh $v0, 0x52($s1) -/* 42F8EC 802A920C 8E050000 */ lw $a1, ($s0) -/* 42F8F0 802A9210 26100004 */ addiu $s0, $s0, 4 -/* 42F8F4 802A9214 0C0B1EAF */ jal evt_get_variable -/* 42F8F8 802A9218 0240202D */ daddu $a0, $s2, $zero -/* 42F8FC 802A921C 00022400 */ sll $a0, $v0, 0x10 -/* 42F900 802A9220 00042403 */ sra $a0, $a0, 0x10 -/* 42F904 802A9224 0C09A089 */ jal func_80268224 -/* 42F908 802A9228 A6220050 */ sh $v0, 0x50($s1) -/* 42F90C 802A922C A6220050 */ sh $v0, 0x50($s1) -/* 42F910 802A9230 8E050000 */ lw $a1, ($s0) -/* 42F914 802A9234 0C0B1EAF */ jal evt_get_variable -/* 42F918 802A9238 0240202D */ daddu $a0, $s2, $zero -/* 42F91C 802A923C 3C04FFFF */ lui $a0, 0xffff -/* 42F920 802A9240 34847FFF */ ori $a0, $a0, 0x7fff -/* 42F924 802A9244 A6220064 */ sh $v0, 0x64($s1) -/* 42F928 802A9248 A2200060 */ sb $zero, 0x60($s1) -/* 42F92C 802A924C A6200044 */ sh $zero, 0x44($s1) -/* 42F930 802A9250 A6200048 */ sh $zero, 0x48($s1) -/* 42F934 802A9254 8E620000 */ lw $v0, ($s3) -/* 42F938 802A9258 2403000A */ addiu $v1, $zero, 0xa -/* 42F93C 802A925C A2600081 */ sb $zero, 0x81($s3) -/* 42F940 802A9260 A2600086 */ sb $zero, 0x86($s3) -/* 42F944 802A9264 A623004C */ sh $v1, 0x4c($s1) -/* 42F948 802A9268 00441024 */ and $v0, $v0, $a0 -/* 42F94C 802A926C 0C09A446 */ jal func_80269118 -/* 42F950 802A9270 AE620000 */ sw $v0, ($s3) -/* 42F954 802A9274 080AA4A1 */ j .L802A9284 -/* 42F958 802A9278 24020002 */ addiu $v0, $zero, 2 -.L802A927C: -/* 42F95C 802A927C A0600081 */ sb $zero, 0x81($v1) -/* 42F960 802A9280 24020002 */ addiu $v0, $zero, 2 -.L802A9284: -/* 42F964 802A9284 8FBF0020 */ lw $ra, 0x20($sp) -/* 42F968 802A9288 8FB3001C */ lw $s3, 0x1c($sp) -/* 42F96C 802A928C 8FB20018 */ lw $s2, 0x18($sp) -/* 42F970 802A9290 8FB10014 */ lw $s1, 0x14($sp) -/* 42F974 802A9294 8FB00010 */ lw $s0, 0x10($sp) -/* 42F978 802A9298 03E00008 */ jr $ra -/* 42F97C 802A929C 27BD0028 */ addiu $sp, $sp, 0x28 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 deleted file mode 100644 index 8e2507e351..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A97AC_42FE8C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A97AC_42FE8C -/* 42FE8C 802A97AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 42FE90 802A97B0 AFB1001C */ sw $s1, 0x1c($sp) -/* 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 -/* 42FEA8 802A97C8 8E240004 */ lw $a0, 4($s1) -/* 42FEAC 802A97CC 0C0511EA */ jal draw_hud_element_clipped -/* 42FEB0 802A97D0 8E24000C */ lw $a0, 0xc($s1) -/* 42FEB4 802A97D4 8E300008 */ lw $s0, 8($s1) -/* 42FEB8 802A97D8 0C0511EA */ jal draw_hud_element_clipped -/* 42FEBC 802A97DC 0200202D */ daddu $a0, $s0, $zero -/* 42FEC0 802A97E0 0200202D */ daddu $a0, $s0, $zero -/* 42FEC4 802A97E4 27A50010 */ addiu $a1, $sp, 0x10 -/* 42FEC8 802A97E8 0C05126B */ jal get_hud_element_render_pos -/* 42FECC 802A97EC 27A60014 */ addiu $a2, $sp, 0x14 -/* 42FED0 802A97F0 86220068 */ lh $v0, 0x68($s1) -/* 42FED4 802A97F4 14400011 */ bnez $v0, .L802A983C -/* 42FED8 802A97F8 3C0451EB */ lui $a0, 0x51eb -/* 42FEDC 802A97FC 96230044 */ lhu $v1, 0x44($s1) -/* 42FEE0 802A9800 3484851F */ ori $a0, $a0, 0x851f -/* 42FEE4 802A9804 00031C00 */ sll $v1, $v1, 0x10 -/* 42FEE8 802A9808 00031403 */ sra $v0, $v1, 0x10 -/* 42FEEC 802A980C 00440018 */ mult $v0, $a0 -/* 42FEF0 802A9810 8FA50014 */ lw $a1, 0x14($sp) -/* 42FEF4 802A9814 00031FC3 */ sra $v1, $v1, 0x1f -/* 42FEF8 802A9818 8FA40010 */ lw $a0, 0x10($sp) -/* 42FEFC 802A981C 00003810 */ mfhi $a3 -/* 42FF00 802A9820 00073143 */ sra $a2, $a3, 5 -/* 42FF04 802A9824 00C33023 */ subu $a2, $a2, $v1 -/* 42FF08 802A9828 00063400 */ sll $a2, $a2, 0x10 -/* 42FF0C 802A982C 0C09A1DC */ jal func_80268770 -/* 42FF10 802A9830 00063403 */ sra $a2, $a2, 0x10 -/* 42FF14 802A9834 080AA61D */ j .L802A9874 -/* 42FF18 802A9838 00000000 */ nop -.L802A983C: -/* 42FF1C 802A983C 96230044 */ lhu $v1, 0x44($s1) -/* 42FF20 802A9840 3484851F */ ori $a0, $a0, 0x851f -/* 42FF24 802A9844 00031C00 */ sll $v1, $v1, 0x10 -/* 42FF28 802A9848 00031403 */ sra $v0, $v1, 0x10 -/* 42FF2C 802A984C 00440018 */ mult $v0, $a0 -/* 42FF30 802A9850 8FA50014 */ lw $a1, 0x14($sp) -/* 42FF34 802A9854 00031FC3 */ sra $v1, $v1, 0x1f -/* 42FF38 802A9858 8FA40010 */ lw $a0, 0x10($sp) -/* 42FF3C 802A985C 00003810 */ mfhi $a3 -/* 42FF40 802A9860 00073143 */ sra $a2, $a3, 5 -/* 42FF44 802A9864 00C33023 */ subu $a2, $a2, $v1 -/* 42FF48 802A9868 00063400 */ sll $a2, $a2, 0x10 -/* 42FF4C 802A986C 0C09A203 */ jal func_8026880C -/* 42FF50 802A9870 00063403 */ sra $a2, $a2, 0x10 -.L802A9874: -/* 42FF54 802A9874 8E240014 */ lw $a0, 0x14($s1) -/* 42FF58 802A9878 0C0511EA */ jal draw_hud_element_clipped -/* 42FF5C 802A987C 00000000 */ nop -/* 42FF60 802A9880 8FBF0020 */ lw $ra, 0x20($sp) -/* 42FF64 802A9884 8FB1001C */ lw $s1, 0x1c($sp) -/* 42FF68 802A9888 8FB00018 */ lw $s0, 0x18($sp) -/* 42FF6C 802A988C 03E00008 */ jr $ra -/* 42FF70 802A9890 27BD0028 */ addiu $sp, $sp, 0x28 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 deleted file mode 100644 index 9dc1814443..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/hurricane/func_802A9894_42FF74.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9894_42FF74 -/* 42FF74 802A9894 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 42FF78 802A9898 AFB00010 */ sw $s0, 0x10($sp) -/* 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) -/* 42FF90 802A98B0 0C05123D */ jal free_hud_element -/* 42FF94 802A98B4 8E040008 */ lw $a0, 8($s0) -/* 42FF98 802A98B8 0C05123D */ jal free_hud_element -/* 42FF9C 802A98BC 8E04000C */ lw $a0, 0xc($s0) -/* 42FFA0 802A98C0 0C05123D */ jal free_hud_element -/* 42FFA4 802A98C4 8E040014 */ lw $a0, 0x14($s0) -/* 42FFA8 802A98C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 42FFAC 802A98CC 8FB00010 */ lw $s0, 0x10($sp) -/* 42FFB0 802A98D0 03E00008 */ jr $ra -/* 42FFB4 802A98D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42FFB8 802A98D8 00000000 */ nop -/* 42FFBC 802A98DC 00000000 */ nop 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 deleted file mode 100644 index 7f40e0f282..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A9000_42EE20.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9000_42EE20 -/* 42EE20 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 42EE24 802A9004 AFB00010 */ sw $s0, 0x10($sp) -/* 42EE28 802A9008 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 42EE2C 802A900C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 42EE30 802A9010 24020010 */ addiu $v0, $zero, 0x10 -/* 42EE34 802A9014 AFBF0018 */ sw $ra, 0x18($sp) -/* 42EE38 802A9018 AFB10014 */ sw $s1, 0x14($sp) -/* 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(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 -/* 42EE5C 802A903C 0200182D */ daddu $v1, $s0, $zero -/* 42EE60 802A9040 0C09A216 */ jal func_80268858 -/* 42EE64 802A9044 00000000 */ nop -/* 42EE68 802A9048 3C048011 */ lui $a0, %hi(D_80108E1C) -/* 42EE6C 802A904C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) -/* 42EE70 802A9050 24020013 */ addiu $v0, $zero, 0x13 -/* 42EE74 802A9054 A622004A */ sh $v0, 0x4a($s1) -/* 42EE78 802A9058 2402001E */ addiu $v0, $zero, 0x1e -/* 42EE7C 802A905C A620004C */ sh $zero, 0x4c($s1) -/* 42EE80 802A9060 A2200060 */ sb $zero, 0x60($s1) -/* 42EE84 802A9064 A6200044 */ sh $zero, 0x44($s1) -/* 42EE88 802A9068 A6200048 */ sh $zero, 0x48($s1) -/* 42EE8C 802A906C A6200068 */ sh $zero, 0x68($s1) -/* 42EE90 802A9070 A2000081 */ sb $zero, 0x81($s0) -/* 42EE94 802A9074 A2000086 */ sb $zero, 0x86($s0) -/* 42EE98 802A9078 A622006C */ sh $v0, 0x6c($s1) -/* 42EE9C 802A907C 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 42EEA0 802A9080 A6220056 */ sh $v0, 0x56($s1) -/* 42EEA4 802A9084 24020050 */ addiu $v0, $zero, 0x50 -/* 42EEA8 802A9088 0C050529 */ jal create_hud_element -/* 42EEAC 802A908C A6220058 */ sh $v0, 0x58($s1) -/* 42EEB0 802A9090 0040802D */ daddu $s0, $v0, $zero -/* 42EEB4 802A9094 86250056 */ lh $a1, 0x56($s1) -/* 42EEB8 802A9098 86260058 */ lh $a2, 0x58($s1) -/* 42EEBC 802A909C 0200202D */ daddu $a0, $s0, $zero -/* 42EEC0 802A90A0 0C051261 */ jal set_hud_element_render_pos -/* 42EEC4 802A90A4 AE300004 */ sw $s0, 4($s1) -/* 42EEC8 802A90A8 0200202D */ daddu $a0, $s0, $zero -/* 42EECC 802A90AC 0C051277 */ jal set_hud_element_render_depth -/* 42EED0 802A90B0 0000282D */ daddu $a1, $zero, $zero -/* 42EED4 802A90B4 0200202D */ daddu $a0, $s0, $zero -/* 42EED8 802A90B8 0C051280 */ jal set_hud_element_flags -/* 42EEDC 802A90BC 24050082 */ addiu $a1, $zero, 0x82 -/* 42EEE0 802A90C0 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 42EEE4 802A90C4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) -/* 42EEE8 802A90C8 0C050529 */ jal create_hud_element -/* 42EEEC 802A90CC 00000000 */ nop -/* 42EEF0 802A90D0 0040802D */ daddu $s0, $v0, $zero -/* 42EEF4 802A90D4 86250056 */ lh $a1, 0x56($s1) -/* 42EEF8 802A90D8 86260058 */ lh $a2, 0x58($s1) -/* 42EEFC 802A90DC 0200202D */ daddu $a0, $s0, $zero -/* 42EF00 802A90E0 AE300008 */ sw $s0, 8($s1) -/* 42EF04 802A90E4 0C051261 */ jal set_hud_element_render_pos -/* 42EF08 802A90E8 24C6001C */ addiu $a2, $a2, 0x1c -/* 42EF0C 802A90EC 0200202D */ daddu $a0, $s0, $zero -/* 42EF10 802A90F0 0C051277 */ jal set_hud_element_render_depth -/* 42EF14 802A90F4 0000282D */ daddu $a1, $zero, $zero -/* 42EF18 802A90F8 0200202D */ daddu $a0, $s0, $zero -/* 42EF1C 802A90FC 0C051280 */ jal set_hud_element_flags -/* 42EF20 802A9100 24050082 */ addiu $a1, $zero, 0x82 -/* 42EF24 802A9104 3C048029 */ lui $a0, %hi(D_80292974) -/* 42EF28 802A9108 24842974 */ addiu $a0, $a0, %lo(D_80292974) -/* 42EF2C 802A910C 0C050529 */ jal create_hud_element -/* 42EF30 802A9110 00000000 */ nop -/* 42EF34 802A9114 0040802D */ daddu $s0, $v0, $zero -/* 42EF38 802A9118 86250056 */ lh $a1, 0x56($s1) -/* 42EF3C 802A911C 86260058 */ lh $a2, 0x58($s1) -/* 42EF40 802A9120 0200202D */ daddu $a0, $s0, $zero -/* 42EF44 802A9124 AE30000C */ sw $s0, 0xc($s1) -/* 42EF48 802A9128 0C051261 */ jal set_hud_element_render_pos -/* 42EF4C 802A912C 24C6001C */ addiu $a2, $a2, 0x1c -/* 42EF50 802A9130 0200202D */ daddu $a0, $s0, $zero -/* 42EF54 802A9134 0C051277 */ jal set_hud_element_render_depth -/* 42EF58 802A9138 0000282D */ daddu $a1, $zero, $zero -/* 42EF5C 802A913C 0200202D */ daddu $a0, $s0, $zero -/* 42EF60 802A9140 0C051280 */ jal set_hud_element_flags -/* 42EF64 802A9144 24050082 */ addiu $a1, $zero, 0x82 -/* 42EF68 802A9148 080AA456 */ j .L802A9158 -/* 42EF6C 802A914C 24020002 */ addiu $v0, $zero, 2 -.L802A9150: -/* 42EF70 802A9150 A0600081 */ sb $zero, 0x81($v1) -/* 42EF74 802A9154 24020002 */ addiu $v0, $zero, 2 -.L802A9158: -/* 42EF78 802A9158 8FBF0018 */ lw $ra, 0x18($sp) -/* 42EF7C 802A915C 8FB10014 */ lw $s1, 0x14($sp) -/* 42EF80 802A9160 8FB00010 */ lw $s0, 0x10($sp) -/* 42EF84 802A9164 03E00008 */ jr $ra -/* 42EF88 802A9168 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index f08d116268..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A916C_42EF8C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A916C_42EF8C -/* 42EF8C 802A916C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 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(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) -/* 42EFB0 802A9190 AFBF0020 */ sw $ra, 0x20($sp) -/* 42EFB4 802A9194 AFB00010 */ sw $s0, 0x10($sp) -/* 42EFB8 802A9198 82620083 */ lb $v0, 0x83($s3) -/* 42EFBC 802A919C 8E50000C */ lw $s0, 0xc($s2) -/* 42EFC0 802A91A0 10400023 */ beqz $v0, .L802A9230 -/* 42EFC4 802A91A4 0260182D */ daddu $v1, $s3, $zero -/* 42EFC8 802A91A8 0C09A216 */ jal func_80268858 -/* 42EFCC 802A91AC 00000000 */ nop -/* 42EFD0 802A91B0 8E050000 */ lw $a1, ($s0) -/* 42EFD4 802A91B4 26100004 */ addiu $s0, $s0, 4 -/* 42EFD8 802A91B8 0C0B1EAF */ jal evt_get_variable -/* 42EFDC 802A91BC 0240202D */ daddu $a0, $s2, $zero -/* 42EFE0 802A91C0 A622004E */ sh $v0, 0x4e($s1) -/* 42EFE4 802A91C4 8E050000 */ lw $a1, ($s0) -/* 42EFE8 802A91C8 26100004 */ addiu $s0, $s0, 4 -/* 42EFEC 802A91CC 0C0B1EAF */ jal evt_get_variable -/* 42EFF0 802A91D0 0240202D */ daddu $a0, $s2, $zero -/* 42EFF4 802A91D4 A6220052 */ sh $v0, 0x52($s1) -/* 42EFF8 802A91D8 8E050000 */ lw $a1, ($s0) -/* 42EFFC 802A91DC 0C0B1EAF */ jal evt_get_variable -/* 42F000 802A91E0 0240202D */ daddu $a0, $s2, $zero -/* 42F004 802A91E4 00022400 */ sll $a0, $v0, 0x10 -/* 42F008 802A91E8 00042403 */ sra $a0, $a0, 0x10 -/* 42F00C 802A91EC 0C09A089 */ jal func_80268224 -/* 42F010 802A91F0 A6220050 */ sh $v0, 0x50($s1) -/* 42F014 802A91F4 3C04FFFF */ lui $a0, 0xffff -/* 42F018 802A91F8 34847FFF */ ori $a0, $a0, 0x7fff -/* 42F01C 802A91FC A6220050 */ sh $v0, 0x50($s1) -/* 42F020 802A9200 A2200060 */ sb $zero, 0x60($s1) -/* 42F024 802A9204 A6200044 */ sh $zero, 0x44($s1) -/* 42F028 802A9208 A6200048 */ sh $zero, 0x48($s1) -/* 42F02C 802A920C 8E620000 */ lw $v0, ($s3) -/* 42F030 802A9210 2403000A */ addiu $v1, $zero, 0xa -/* 42F034 802A9214 A2600081 */ sb $zero, 0x81($s3) -/* 42F038 802A9218 A623004C */ sh $v1, 0x4c($s1) -/* 42F03C 802A921C 00441024 */ and $v0, $v0, $a0 -/* 42F040 802A9220 0C09A446 */ jal func_80269118 -/* 42F044 802A9224 AE620000 */ sw $v0, ($s3) -/* 42F048 802A9228 080AA48E */ j .L802A9238 -/* 42F04C 802A922C 24020002 */ addiu $v0, $zero, 2 -.L802A9230: -/* 42F050 802A9230 A0600081 */ sb $zero, 0x81($v1) -/* 42F054 802A9234 24020002 */ addiu $v0, $zero, 2 -.L802A9238: -/* 42F058 802A9238 8FBF0020 */ lw $ra, 0x20($sp) -/* 42F05C 802A923C 8FB3001C */ lw $s3, 0x1c($sp) -/* 42F060 802A9240 8FB20018 */ lw $s2, 0x18($sp) -/* 42F064 802A9244 8FB10014 */ lw $s1, 0x14($sp) -/* 42F068 802A9248 8FB00010 */ lw $s0, 0x10($sp) -/* 42F06C 802A924C 03E00008 */ jr $ra -/* 42F070 802A9250 27BD0028 */ addiu $sp, $sp, 0x28