From 789049ee36fc510944acad0c21c3293f65ece6be Mon Sep 17 00:00:00 2001 From: eperdew Date: Sat, 9 Oct 2021 15:30:38 -0700 Subject: [PATCH] Decompile action_cmd/bomb.c (#467) * Decompile the easy functions of bomb.c * Deduplicate action command function in bomb.c * Fully decompile bomb.c * Remove matched func_802A928C_427CFC.s * Clean up bomb.c before making a PR. * Address @nanaian's feedback. * Convert nonsense function pointer symbol reference to proper BSS var. --- src/battle/action_cmd/0A.c | 18 +- src/battle/action_cmd/air_lift.c | 4 +- src/battle/action_cmd/air_raid.c | 2 +- src/battle/action_cmd/bomb.c | 207 +++++++++++- .../common/UnkActionCommandFunc1.inc.c | 27 ++ src/battle/action_cmd/dizzy_shell.c | 2 +- src/battle/action_cmd/fire_shell.c | 2 +- src/battle/action_cmd/mega_shock.c | 3 - src/battle/action_cmd/smack.c | 18 +- src/battle/action_cmd/spiny_surge.c | 2 +- src/battle/action_cmd/spook.c | 18 +- .../asm/nonmatchings/196AA0/func_80268AF8.s | 16 +- .../air_lift/func_802A9278_428CE8.s | 4 +- .../air_lift/func_802A96EC_42915C.s | 4 +- .../air_raid/func_802A984C_429B6C.s | 62 ---- .../action_cmd/bomb/func_802A9000_427A70.s | 98 ------ .../action_cmd/bomb/func_802A928C_427CFC.s | 311 ------------------ .../action_cmd/bomb/func_802A96EC_42815C.s | 62 ---- .../dizzy_shell/func_802A96DC_42684C.s | 62 ---- .../fire_shell/func_802A9834_427204.s | 62 ---- .../spiny_surge/func_802A973C_42F55C.s | 62 ---- ver/us/splat.yaml | 2 +- ver/us/symbol_addrs.txt | 16 +- 23 files changed, 261 insertions(+), 803 deletions(-) create mode 100644 src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A984C_429B6C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9000_427A70.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A96EC_42815C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A96DC_42684C.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9834_427204.s delete mode 100644 ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A973C_42F55C.s diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index 3c9bc0b7ba..accde90b91 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -8,22 +8,6 @@ INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A9000_4273B0); INCLUDE_ASM(s32, "battle/action_cmd/0A", func_802A928C_42763C); -void func_802A955C_42790C(void) { - ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; - s32 renderPosX; - s32 renderPosY; - s32 hudElementID; - - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); - hudElementID = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElementID); - get_hud_element_render_pos(hudElementID, &renderPosX, &renderPosY); - if (actionCommandStatus->unk_68 == 0) { - func_80268770(renderPosX, renderPosY, actionCommandStatus->barFillLevel / 100); - } else { - func_8026880C(renderPosX, renderPosY, actionCommandStatus->barFillLevel / 100); - } - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); -} +#include "common/UnkActionCommandFunc1.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/air_lift.c b/src/battle/action_cmd/air_lift.c index 4b0a26be57..0b10a0dbe1 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -6,7 +6,7 @@ extern s32 D_80108AFC; extern s32 D_80108B28; extern s32 D_80292974; extern s32 D_80294340; -extern s32 func_802A98B0_42EC50; +BSS s32 air_lift_bss_0; ApiStatus func_802A9000_428A70(Evt* script, s32 isInitialCall) { s32 *args = script->ptrReadPos; @@ -30,7 +30,7 @@ ApiStatus func_802A9000_428A70(Evt* script, s32 isInitialCall) { battleStatus->unk_84 = 0; actionCommandStatus->unk_6C = 30; actionCommandStatus->hudElementX = -48; - func_802A98B0_42EC50 = 0; + air_lift_bss_0 = 0; actionCommandStatus->hudElementY = 80; hudElement = create_hud_element(&D_80108B28); diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index 8c7ec166cf..dcbd9f6cdd 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A9000_429320); INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A9294_4295B4); -INCLUDE_ASM(s32, "battle/action_cmd/air_raid", func_802A984C_429B6C); +#include "common/UnkActionCommandFunc1.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/bomb.c b/src/battle/action_cmd/bomb.c index 4a690b5274..cf95cfc4fd 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -2,12 +2,213 @@ #define NAMESPACE action_command_bomb -INCLUDE_ASM(s32, "battle/action_cmd/bomb", func_802A9000_427A70); +void btl_set_popup_duration(s32); +void func_80268C9C(void); +void func_80269160(void); +void sfx_adjust_env_sound_params(s32, s32, s32, s32); + +extern HudElementAnim D_80108AFC; +extern HudElementAnim D_80108B28; +extern HudElementAnim D_80292974; +extern s32 D_80294300; + +extern HudElementAnim D_80108B80; + +typedef struct UnkVec2s { + /* 0x00 */ s16 unk_0; + /* 0x02 */ s16 unk_2; +} UnkVec2s; + +UnkVec2s D_802A9812_428280[] = { + { 0x0, 0x00 }, + { 0x0, 0x19 }, + { 0x0, 0x32 }, + { 0x0, 0x4B }, + { 0x0, 0x4B }, + { 0x0, 0x00 }, + { 0x0, 0x00 }, + { 0x0, 0x00 }, +}; + +ApiStatus func_802A9000_427A70(Evt* script, s32 isInitialCall) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 hudElement; + + battleStatus->unk_82 = 100; + battleStatus->unk_434 = &D_80294300; + battleStatus->unk_86 = 127; + + if (battleStatus->unk_83 == 0) { + battleStatus->actionSuccess = 0; + return ApiStatus_DONE2; + } + + func_80268858(); + actionCommandStatus->actionCommandID = 0xB; + actionCommandStatus->unk_61 = TRUE; + actionCommandStatus->state = 0; + actionCommandStatus->unk_60 = 0; + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_48 = 0; + actionCommandStatus->unk_68 = FALSE; + 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" -INCLUDE_ASM(s32, "battle/action_cmd/bomb", func_802A928C_427CFC); +void func_802A928C_427CFC(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + BattleStatus* battleStatus = &gBattleStatus; + s32 hudElement; + s32 mashMeterCutoff; -INCLUDE_ASM(s32, "battle/action_cmd/bomb", func_802A96EC_42815C); + switch (actionCommandStatus->state) { + case 0: + btl_set_popup_duration(99); + hudElement = actionCommandStatus->hudElements[0]; + set_hud_element_alpha(hudElement, 255); + if (actionCommandStatus->unk_61) { + clear_hud_element_flags(hudElement, 0x2); + } + + hudElement = actionCommandStatus->hudElements[1]; + set_hud_element_alpha(hudElement, 255); + if (actionCommandStatus->unk_61) { + clear_hud_element_flags(hudElement, 0x2); + } + + actionCommandStatus->state = 1; + break; + case 1: + btl_set_popup_duration(99); + + actionCommandStatus->hudElementX += 20; + if (actionCommandStatus->hudElementX > 50) { + actionCommandStatus->hudElementX = 50; + } + + set_hud_element_render_pos(actionCommandStatus->hudElements[0], actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY); + set_hud_element_render_pos(actionCommandStatus->hudElements[1], actionCommandStatus->hudElementX, + actionCommandStatus->hudElementY + 28); + break; + case 10: + btl_set_popup_duration(99); + + if (actionCommandStatus->unk_4E != 0) { + actionCommandStatus->unk_4E--; + break; + } + + set_hud_element_anim(actionCommandStatus->hudElements[0], &D_80108B80); + actionCommandStatus->barFillLevel = 0; + actionCommandStatus->unk_54 = actionCommandStatus->unk_52; + sfx_play_sound_with_params(0x80000041, 0, 0, 0); + actionCommandStatus->state = 11; + + // fallthrough + case 11: + btl_set_popup_duration(99); + if (!actionCommandStatus->unk_68) { + mashMeterCutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals]; + actionCommandStatus->barFillLevel -= + D_802A9812_428280[actionCommandStatus->barFillLevel / mashMeterCutoff / 20].unk_2; + + if (actionCommandStatus->barFillLevel < 0) { + actionCommandStatus->barFillLevel = 0; + } + } + + if (battleStatus->currentButtonsPressed & 0x8000) { + switch(actionCommandStatus->unk_64) { + case 0: { + s32 fillOffset = battleStatus->unk_434[actionCommandStatus->unk_50] * 235 * 4; + actionCommandStatus->barFillLevel += fillOffset / 100; + break; + } + case 1: + actionCommandStatus->barFillLevel += battleStatus->unk_434[actionCommandStatus->unk_50] * 8; + break; + case 2: { + s32 fillOffset = battleStatus->unk_434[actionCommandStatus->unk_50] * 185 * 4; + actionCommandStatus->barFillLevel += fillOffset / 100; + break; + } + } + } + + if (actionCommandStatus->barFillLevel > 10000) { + hudElement = actionCommandStatus->hudElements[2]; + actionCommandStatus->barFillLevel = 10000; + actionCommandStatus->unk_68 = TRUE; + set_hud_element_render_pos(hudElement, actionCommandStatus->hudElementX + 50, + actionCommandStatus->hudElementY + 28); + clear_hud_element_flags(hudElement, 0x2); + } + + battleStatus->unk_84 = actionCommandStatus->barFillLevel / 100; + sfx_adjust_env_sound_params(0x80000041, 0, 0, battleStatus->unk_84 * 12); + + if (actionCommandStatus->unk_54 == 0) { + if (actionCommandStatus->barFillLevel == 0) { + battleStatus->actionSuccess = -1; + } else { + battleStatus->actionSuccess = actionCommandStatus->barFillLevel / 100; + } + + mashMeterCutoff = actionCommandStatus->mashMeterCutoffs[actionCommandStatus->mashMeterIntervals - 1]; + if (mashMeterCutoff >= battleStatus->actionSuccess) { + battleStatus->unk_86 = -2; + } else { + battleStatus->unk_86 = 1; + } + + if (battleStatus->actionSuccess == 100) { + func_80269160(); + } + + sfx_stop_sound(0x80000041); + btl_set_popup_duration(0); + actionCommandStatus->unk_54 = 5; + actionCommandStatus->state = 12; + } else { + actionCommandStatus->unk_54--; + } + break; + case 12: + if (actionCommandStatus->unk_54 != 0) { + actionCommandStatus->unk_54--; + } else { + func_80268C9C(); + } + break; + } +} + +#include "common/UnkActionCommandFunc1.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c b/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c new file mode 100644 index 0000000000..b4b2ca0016 --- /dev/null +++ b/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c @@ -0,0 +1,27 @@ +#include "common.h" + +void func_80268770(s32, s32, s32); +void func_8026880C(s32, s32, s32); + +void N(UnkActionCommandFunc1)(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + + s32 hudX; + s32 hudY; + s32 hudElement; + s32 barFillLevel; + + draw_hud_element_clipped(actionCommandStatus->hudElements[0]); + + 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[2]); +} diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 8d716a8f72..240fb5a362 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A9000_426170); INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A928C_4263FC); -INCLUDE_ASM(s32, "battle/action_cmd/dizzy_shell", func_802A96DC_42684C); +#include "common/UnkActionCommandFunc1.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/fire_shell.c b/src/battle/action_cmd/fire_shell.c index b635832a0c..9953f7f30f 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9000_4269D0); INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9294_426C64); -INCLUDE_ASM(s32, "battle/action_cmd/fire_shell", func_802A9834_427204); +#include "common/UnkActionCommandFunc1.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 803bab0638..06b03ed8c4 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -17,9 +17,6 @@ void func_80268C9C(void); void func_80269160(void); void sfx_adjust_env_sound_params(s32, s32, s32, s32); -void func_80268770(s32, s32, s16); -void func_8026880C(s32, s32, s16); - typedef struct structD_802A9930_42E340 { /* 0x00 */ s16 unk_0; /* 0x08 */ u16 unk_8; diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index 346923d32c..d4186fffc8 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -292,22 +292,6 @@ void func_802A9298_42E638(void) { } } -void func_802A98B0_42EC50(void) { - ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; - s32 renderPosX; - s32 renderPosY; - s32 hudElementID; - - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); - hudElementID = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElementID); - get_hud_element_render_pos(hudElementID, &renderPosX, &renderPosY); - if (actionCommandStatus->unk_68 == 0) { - func_80268770(renderPosX, renderPosY, actionCommandStatus->barFillLevel / 100); - } else { - func_8026880C(renderPosX, renderPosY, actionCommandStatus->barFillLevel / 100); - } - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); -} +#include "common/UnkActionCommandFunc1.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/spiny_surge.c b/src/battle/action_cmd/spiny_surge.c index 90f08799ab..657c140ac5 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A916C_42EF8C); INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A9254_42F074); -INCLUDE_ASM(s32, "battle/action_cmd/spiny_surge", func_802A973C_42F55C); +#include "common/UnkActionCommandFunc1.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/spook.c b/src/battle/action_cmd/spook.c index 88de246360..998eee4b53 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -59,22 +59,6 @@ ApiStatus func_802A9000_430020(void) { // wip: decomp.me/scratch/tAhNa INCLUDE_ASM(s32, "battle/action_cmd/spook", func_802A9298_4302B8); -void func_802A97FC_43081C(void) { - ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; - s32 renderPosY; - s32 renderPosX; - HudElement* hudElement; - - draw_hud_element_clipped(actionCommandStatus->hudElements[0]); - hudElement = actionCommandStatus->hudElements[1]; - draw_hud_element_clipped(hudElement); - get_hud_element_render_pos(hudElement, &renderPosX, &renderPosY); - if (actionCommandStatus->unk_68 == 0) { - func_80268770(renderPosX, renderPosY, actionCommandStatus->barFillLevel / 100); - } else { - func_8026880C(renderPosX, renderPosY, actionCommandStatus->barFillLevel / 100); - } - draw_hud_element_clipped(actionCommandStatus->hudElements[2]); -} +#include "common/UnkActionCommandFunc1.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s b/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s index 5ad652bd2f..6fe8950730 100644 --- a/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s +++ b/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s @@ -57,22 +57,22 @@ glabel L80268B88_197468 /* 197470 80268B90 0809A324 */ j L80268C90_197570 /* 197474 80268B94 00000000 */ nop glabel L80268B98_197478 -/* 197478 80268B98 0C0AA5B7 */ jal func_802A96DC_42684C +/* 197478 80268B98 0C0AA5B7 */ jal action_command_dizzy_shell_UnkActionCommandFunc1 /* 19747C 80268B9C 00000000 */ nop /* 197480 80268BA0 0809A324 */ j L80268C90_197570 /* 197484 80268BA4 00000000 */ nop glabel L80268BA8_197488 -/* 197488 80268BA8 0C0AA60D */ jal func_802A9834_427204 +/* 197488 80268BA8 0C0AA60D */ jal action_command_fire_shell_UnkActionCommandFunc1 /* 19748C 80268BAC 00000000 */ nop /* 197490 80268BB0 0809A324 */ j L80268C90_197570 /* 197494 80268BB4 00000000 */ nop glabel L80268BB8_197498 -/* 197498 80268BB8 0C0AA557 */ jal func_802A955C_42790C +/* 197498 80268BB8 0C0AA557 */ jal action_command_0A_UnkActionCommandFunc1 /* 19749C 80268BBC 00000000 */ nop /* 1974A0 80268BC0 0809A324 */ j L80268C90_197570 /* 1974A4 80268BC4 00000000 */ nop glabel L80268BC8_1974A8 -/* 1974A8 80268BC8 0C0AA5BB */ jal func_802A96EC_42815C +/* 1974A8 80268BC8 0C0AA5BB */ jal action_command_bomb_UnkActionCommandFunc1 /* 1974AC 80268BCC 00000000 */ nop /* 1974B0 80268BD0 0809A324 */ j L80268C90_197570 /* 1974B4 80268BD4 00000000 */ nop @@ -82,12 +82,12 @@ glabel L80268BD8_1974B8 /* 1974C0 80268BE0 0809A324 */ j L80268C90_197570 /* 1974C4 80268BE4 00000000 */ nop glabel L80268BE8_1974C8 -/* 1974C8 80268BE8 0C0AA5BB */ jal func_802A96EC_42815C +/* 1974C8 80268BE8 0C0AA5BB */ jal action_command_bomb_UnkActionCommandFunc1 /* 1974CC 80268BEC 00000000 */ nop /* 1974D0 80268BF0 0809A324 */ j L80268C90_197570 /* 1974D4 80268BF4 00000000 */ nop glabel L80268BF8_1974D8 -/* 1974D8 80268BF8 0C0AA613 */ jal func_802A984C_429B6C +/* 1974D8 80268BF8 0C0AA613 */ jal action_command_air_raid_UnkActionCommandFunc1 /* 1974DC 80268BFC 00000000 */ nop /* 1974E0 80268C00 0809A324 */ j L80268C90_197570 /* 1974E4 80268C04 00000000 */ nop @@ -107,12 +107,12 @@ glabel L80268C28_197508 /* 197510 80268C30 0809A324 */ j L80268C90_197570 /* 197514 80268C34 00000000 */ nop glabel L80268C38_197518 -/* 197518 80268C38 0C0AA62C */ jal func_802A98B0_42EC50 +/* 197518 80268C38 0C0AA62C */ jal action_command_smack_UnkActionCommandFunc1 /* 19751C 80268C3C 00000000 */ nop /* 197520 80268C40 0809A324 */ j L80268C90_197570 /* 197524 80268C44 00000000 */ nop glabel L80268C48_197528 -/* 197528 80268C48 0C0AA5CF */ jal func_802A973C_42F55C +/* 197528 80268C48 0C0AA5CF */ jal action_command_spiny_surge_UnkActionCommandFunc1 /* 19752C 80268C4C 00000000 */ nop /* 197530 80268C50 0809A324 */ j L80268C90_197570 /* 197534 80268C54 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s index 14c8397d00..714a051207 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A9278_428CE8.s @@ -99,8 +99,8 @@ glabel L802A938C_428DFC /* 428E40 802A93D0 00A0382D */ daddu $a3, $a1, $zero /* 428E44 802A93D4 96220052 */ lhu $v0, 0x52($s1) /* 428E48 802A93D8 24030001 */ addiu $v1, $zero, 1 -/* 428E4C 802A93DC 3C01802B */ lui $at, %hi(func_802A98B0_42EC50) -/* 428E50 802A93E0 AC2398B0 */ sw $v1, %lo(func_802A98B0_42EC50)($at) +/* 428E4C 802A93DC 3C01802B */ lui $at, %hi(action_command_smack_UnkActionCommandFunc1) +/* 428E50 802A93E0 AC2398B0 */ sw $v1, %lo(action_command_smack_UnkActionCommandFunc1)($at) /* 428E54 802A93E4 0C0526AE */ jal sfx_play_sound_with_params /* 428E58 802A93E8 A6220054 */ sh $v0, 0x54($s1) /* 428E5C 802A93EC 2402000B */ addiu $v0, $zero, 0xb diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s index 72b9b074ac..9a0e43a843 100644 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s +++ b/ver/us/asm/nonmatchings/battle/action_cmd/air_lift/func_802A96EC_42915C.s @@ -22,8 +22,8 @@ glabel func_802A96EC_42915C /* 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(func_802A98B0_42EC50) -/* 4291AC 802A973C 8C4298B0 */ lw $v0, %lo(func_802A98B0_42EC50)($v0) +/* 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) diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A984C_429B6C.s b/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A984C_429B6C.s deleted file mode 100644 index 02f693b730..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/air_raid/func_802A984C_429B6C.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A984C_429B6C -/* 429B6C 802A984C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 429B70 802A9850 AFB1001C */ sw $s1, 0x1c($sp) -/* 429B74 802A9854 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 429B78 802A9858 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 429B7C 802A985C AFBF0020 */ sw $ra, 0x20($sp) -/* 429B80 802A9860 AFB00018 */ sw $s0, 0x18($sp) -/* 429B84 802A9864 0C0511EA */ jal draw_hud_element_clipped -/* 429B88 802A9868 8E240004 */ lw $a0, 4($s1) -/* 429B8C 802A986C 8E300008 */ lw $s0, 8($s1) -/* 429B90 802A9870 0C0511EA */ jal draw_hud_element_clipped -/* 429B94 802A9874 0200202D */ daddu $a0, $s0, $zero -/* 429B98 802A9878 0200202D */ daddu $a0, $s0, $zero -/* 429B9C 802A987C 27A50010 */ addiu $a1, $sp, 0x10 -/* 429BA0 802A9880 0C05126B */ jal get_hud_element_render_pos -/* 429BA4 802A9884 27A60014 */ addiu $a2, $sp, 0x14 -/* 429BA8 802A9888 86220068 */ lh $v0, 0x68($s1) -/* 429BAC 802A988C 14400011 */ bnez $v0, .L802A98D4 -/* 429BB0 802A9890 3C0451EB */ lui $a0, 0x51eb -/* 429BB4 802A9894 96230044 */ lhu $v1, 0x44($s1) -/* 429BB8 802A9898 3484851F */ ori $a0, $a0, 0x851f -/* 429BBC 802A989C 00031C00 */ sll $v1, $v1, 0x10 -/* 429BC0 802A98A0 00031403 */ sra $v0, $v1, 0x10 -/* 429BC4 802A98A4 00440018 */ mult $v0, $a0 -/* 429BC8 802A98A8 8FA50014 */ lw $a1, 0x14($sp) -/* 429BCC 802A98AC 00031FC3 */ sra $v1, $v1, 0x1f -/* 429BD0 802A98B0 8FA40010 */ lw $a0, 0x10($sp) -/* 429BD4 802A98B4 00003810 */ mfhi $a3 -/* 429BD8 802A98B8 00073143 */ sra $a2, $a3, 5 -/* 429BDC 802A98BC 00C33023 */ subu $a2, $a2, $v1 -/* 429BE0 802A98C0 00063400 */ sll $a2, $a2, 0x10 -/* 429BE4 802A98C4 0C09A1DC */ jal func_80268770 -/* 429BE8 802A98C8 00063403 */ sra $a2, $a2, 0x10 -/* 429BEC 802A98CC 080AA643 */ j .L802A990C -/* 429BF0 802A98D0 00000000 */ nop -.L802A98D4: -/* 429BF4 802A98D4 96230044 */ lhu $v1, 0x44($s1) -/* 429BF8 802A98D8 3484851F */ ori $a0, $a0, 0x851f -/* 429BFC 802A98DC 00031C00 */ sll $v1, $v1, 0x10 -/* 429C00 802A98E0 00031403 */ sra $v0, $v1, 0x10 -/* 429C04 802A98E4 00440018 */ mult $v0, $a0 -/* 429C08 802A98E8 8FA50014 */ lw $a1, 0x14($sp) -/* 429C0C 802A98EC 00031FC3 */ sra $v1, $v1, 0x1f -/* 429C10 802A98F0 8FA40010 */ lw $a0, 0x10($sp) -/* 429C14 802A98F4 00003810 */ mfhi $a3 -/* 429C18 802A98F8 00073143 */ sra $a2, $a3, 5 -/* 429C1C 802A98FC 00C33023 */ subu $a2, $a2, $v1 -/* 429C20 802A9900 00063400 */ sll $a2, $a2, 0x10 -/* 429C24 802A9904 0C09A203 */ jal func_8026880C -/* 429C28 802A9908 00063403 */ sra $a2, $a2, 0x10 -.L802A990C: -/* 429C2C 802A990C 8E24000C */ lw $a0, 0xc($s1) -/* 429C30 802A9910 0C0511EA */ jal draw_hud_element_clipped -/* 429C34 802A9914 00000000 */ nop -/* 429C38 802A9918 8FBF0020 */ lw $ra, 0x20($sp) -/* 429C3C 802A991C 8FB1001C */ lw $s1, 0x1c($sp) -/* 429C40 802A9920 8FB00018 */ lw $s0, 0x18($sp) -/* 429C44 802A9924 03E00008 */ jr $ra -/* 429C48 802A9928 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9000_427A70.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9000_427A70.s deleted file mode 100644 index 7be86252df..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A9000_427A70.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_427A70 -/* 427A70 802A9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 427A74 802A9004 AFB00010 */ sw $s0, 0x10($sp) -/* 427A78 802A9008 3C10800E */ lui $s0, %hi(gBattleStatus) -/* 427A7C 802A900C 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) -/* 427A80 802A9010 24020064 */ addiu $v0, $zero, 0x64 -/* 427A84 802A9014 AFBF0018 */ sw $ra, 0x18($sp) -/* 427A88 802A9018 AFB10014 */ sw $s1, 0x14($sp) -/* 427A8C 802A901C A2020082 */ sb $v0, 0x82($s0) -/* 427A90 802A9020 3C028029 */ lui $v0, %hi(D_80294300) -/* 427A94 802A9024 24424300 */ addiu $v0, $v0, %lo(D_80294300) -/* 427A98 802A9028 AE020434 */ sw $v0, 0x434($s0) -/* 427A9C 802A902C 2402007F */ addiu $v0, $zero, 0x7f -/* 427AA0 802A9030 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 427AA4 802A9034 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 427AA8 802A9038 A2020086 */ sb $v0, 0x86($s0) -/* 427AAC 802A903C 82020083 */ lb $v0, 0x83($s0) -/* 427AB0 802A9040 10400044 */ beqz $v0, .L802A9154 -/* 427AB4 802A9044 0200182D */ daddu $v1, $s0, $zero -/* 427AB8 802A9048 0C09A216 */ jal func_80268858 -/* 427ABC 802A904C 00000000 */ nop -/* 427AC0 802A9050 3C048011 */ lui $a0, %hi(D_80108B28) -/* 427AC4 802A9054 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) -/* 427AC8 802A9058 2402000B */ addiu $v0, $zero, 0xb -/* 427ACC 802A905C A622004A */ sh $v0, 0x4a($s1) -/* 427AD0 802A9060 24020001 */ addiu $v0, $zero, 1 -/* 427AD4 802A9064 A2220061 */ sb $v0, 0x61($s1) -/* 427AD8 802A9068 2402FFD0 */ addiu $v0, $zero, -0x30 -/* 427ADC 802A906C A620004C */ sh $zero, 0x4c($s1) -/* 427AE0 802A9070 A2200060 */ sb $zero, 0x60($s1) -/* 427AE4 802A9074 A6200044 */ sh $zero, 0x44($s1) -/* 427AE8 802A9078 A6200048 */ sh $zero, 0x48($s1) -/* 427AEC 802A907C A6200068 */ sh $zero, 0x68($s1) -/* 427AF0 802A9080 A2000081 */ sb $zero, 0x81($s0) -/* 427AF4 802A9084 A6220056 */ sh $v0, 0x56($s1) -/* 427AF8 802A9088 24020050 */ addiu $v0, $zero, 0x50 -/* 427AFC 802A908C 0C050529 */ jal create_hud_element -/* 427B00 802A9090 A6220058 */ sh $v0, 0x58($s1) -/* 427B04 802A9094 0040802D */ daddu $s0, $v0, $zero -/* 427B08 802A9098 86250056 */ lh $a1, 0x56($s1) -/* 427B0C 802A909C 86260058 */ lh $a2, 0x58($s1) -/* 427B10 802A90A0 0200202D */ daddu $a0, $s0, $zero -/* 427B14 802A90A4 0C051261 */ jal set_hud_element_render_pos -/* 427B18 802A90A8 AE300004 */ sw $s0, 4($s1) -/* 427B1C 802A90AC 0200202D */ daddu $a0, $s0, $zero -/* 427B20 802A90B0 0C051277 */ jal set_hud_element_render_depth -/* 427B24 802A90B4 0000282D */ daddu $a1, $zero, $zero -/* 427B28 802A90B8 0200202D */ daddu $a0, $s0, $zero -/* 427B2C 802A90BC 0C051280 */ jal set_hud_element_flags -/* 427B30 802A90C0 24050082 */ addiu $a1, $zero, 0x82 -/* 427B34 802A90C4 3C048011 */ lui $a0, %hi(D_80108AFC) -/* 427B38 802A90C8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) -/* 427B3C 802A90CC 0C050529 */ jal create_hud_element -/* 427B40 802A90D0 00000000 */ nop -/* 427B44 802A90D4 0040802D */ daddu $s0, $v0, $zero -/* 427B48 802A90D8 86250056 */ lh $a1, 0x56($s1) -/* 427B4C 802A90DC 86260058 */ lh $a2, 0x58($s1) -/* 427B50 802A90E0 0200202D */ daddu $a0, $s0, $zero -/* 427B54 802A90E4 AE300008 */ sw $s0, 8($s1) -/* 427B58 802A90E8 0C051261 */ jal set_hud_element_render_pos -/* 427B5C 802A90EC 24C6001C */ addiu $a2, $a2, 0x1c -/* 427B60 802A90F0 0200202D */ daddu $a0, $s0, $zero -/* 427B64 802A90F4 0C051277 */ jal set_hud_element_render_depth -/* 427B68 802A90F8 0000282D */ daddu $a1, $zero, $zero -/* 427B6C 802A90FC 0200202D */ daddu $a0, $s0, $zero -/* 427B70 802A9100 0C051280 */ jal set_hud_element_flags -/* 427B74 802A9104 24050082 */ addiu $a1, $zero, 0x82 -/* 427B78 802A9108 3C048029 */ lui $a0, %hi(D_80292974) -/* 427B7C 802A910C 24842974 */ addiu $a0, $a0, %lo(D_80292974) -/* 427B80 802A9110 0C050529 */ jal create_hud_element -/* 427B84 802A9114 00000000 */ nop -/* 427B88 802A9118 0040802D */ daddu $s0, $v0, $zero -/* 427B8C 802A911C 86250056 */ lh $a1, 0x56($s1) -/* 427B90 802A9120 86260058 */ lh $a2, 0x58($s1) -/* 427B94 802A9124 0200202D */ daddu $a0, $s0, $zero -/* 427B98 802A9128 AE30000C */ sw $s0, 0xc($s1) -/* 427B9C 802A912C 0C051261 */ jal set_hud_element_render_pos -/* 427BA0 802A9130 24C6001C */ addiu $a2, $a2, 0x1c -/* 427BA4 802A9134 0200202D */ daddu $a0, $s0, $zero -/* 427BA8 802A9138 0C051277 */ jal set_hud_element_render_depth -/* 427BAC 802A913C 0000282D */ daddu $a1, $zero, $zero -/* 427BB0 802A9140 0200202D */ daddu $a0, $s0, $zero -/* 427BB4 802A9144 0C051280 */ jal set_hud_element_flags -/* 427BB8 802A9148 24050082 */ addiu $a1, $zero, 0x82 -/* 427BBC 802A914C 080AA457 */ j .L802A915C -/* 427BC0 802A9150 24020002 */ addiu $v0, $zero, 2 -.L802A9154: -/* 427BC4 802A9154 A0600081 */ sb $zero, 0x81($v1) -/* 427BC8 802A9158 24020002 */ addiu $v0, $zero, 2 -.L802A915C: -/* 427BCC 802A915C 8FBF0018 */ lw $ra, 0x18($sp) -/* 427BD0 802A9160 8FB10014 */ lw $s1, 0x14($sp) -/* 427BD4 802A9164 8FB00010 */ lw $s0, 0x10($sp) -/* 427BD8 802A9168 03E00008 */ jr $ra -/* 427BDC 802A916C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s deleted file mode 100644 index 0c98acda42..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A928C_427CFC.s +++ /dev/null @@ -1,311 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A928C_427CFC -/* 427CFC 802A928C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 427D00 802A9290 AFB10014 */ sw $s1, 0x14($sp) -/* 427D04 802A9294 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 427D08 802A9298 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 427D0C 802A929C AFBF001C */ sw $ra, 0x1c($sp) -/* 427D10 802A92A0 AFB20018 */ sw $s2, 0x18($sp) -/* 427D14 802A92A4 AFB00010 */ sw $s0, 0x10($sp) -/* 427D18 802A92A8 8623004C */ lh $v1, 0x4c($s1) -/* 427D1C 802A92AC 3C12800E */ lui $s2, %hi(gBattleStatus) -/* 427D20 802A92B0 2652C070 */ addiu $s2, $s2, %lo(gBattleStatus) -/* 427D24 802A92B4 2C62000D */ sltiu $v0, $v1, 0xd -/* 427D28 802A92B8 10400106 */ beqz $v0, L802A96D4_428144 -/* 427D2C 802A92BC 00031080 */ sll $v0, $v1, 2 -/* 427D30 802A92C0 3C01802B */ lui $at, %hi(jtbl_802A9830_4282A0) -/* 427D34 802A92C4 00220821 */ addu $at, $at, $v0 -/* 427D38 802A92C8 8C229830 */ lw $v0, %lo(jtbl_802A9830_4282A0)($at) -/* 427D3C 802A92CC 00400008 */ jr $v0 -/* 427D40 802A92D0 00000000 */ nop -glabel L802A92D4_427D44 -/* 427D44 802A92D4 0C093EB1 */ jal btl_set_popup_duration -/* 427D48 802A92D8 24040063 */ addiu $a0, $zero, 0x63 -/* 427D4C 802A92DC 8E300004 */ lw $s0, 4($s1) -/* 427D50 802A92E0 240500FF */ addiu $a1, $zero, 0xff -/* 427D54 802A92E4 0C0513AC */ jal set_hud_element_alpha -/* 427D58 802A92E8 0200202D */ daddu $a0, $s0, $zero -/* 427D5C 802A92EC 82220061 */ lb $v0, 0x61($s1) -/* 427D60 802A92F0 10400003 */ beqz $v0, .L802A9300 -/* 427D64 802A92F4 0200202D */ daddu $a0, $s0, $zero -/* 427D68 802A92F8 0C05128B */ jal clear_hud_element_flags -/* 427D6C 802A92FC 24050002 */ addiu $a1, $zero, 2 -.L802A9300: -/* 427D70 802A9300 8E300008 */ lw $s0, 8($s1) -/* 427D74 802A9304 240500FF */ addiu $a1, $zero, 0xff -/* 427D78 802A9308 0C0513AC */ jal set_hud_element_alpha -/* 427D7C 802A930C 0200202D */ daddu $a0, $s0, $zero -/* 427D80 802A9310 82220061 */ lb $v0, 0x61($s1) -/* 427D84 802A9314 10400003 */ beqz $v0, .L802A9324 -/* 427D88 802A9318 0200202D */ daddu $a0, $s0, $zero -/* 427D8C 802A931C 0C05128B */ jal clear_hud_element_flags -/* 427D90 802A9320 24050002 */ addiu $a1, $zero, 2 -.L802A9324: -/* 427D94 802A9324 24020001 */ addiu $v0, $zero, 1 -/* 427D98 802A9328 080AA5B5 */ j L802A96D4_428144 -/* 427D9C 802A932C A622004C */ sh $v0, 0x4c($s1) -glabel L802A9330_427DA0 -/* 427DA0 802A9330 0C093EB1 */ jal btl_set_popup_duration -/* 427DA4 802A9334 24040063 */ addiu $a0, $zero, 0x63 -/* 427DA8 802A9338 96220056 */ lhu $v0, 0x56($s1) -/* 427DAC 802A933C 24420014 */ addiu $v0, $v0, 0x14 -/* 427DB0 802A9340 A6220056 */ sh $v0, 0x56($s1) -/* 427DB4 802A9344 00021400 */ sll $v0, $v0, 0x10 -/* 427DB8 802A9348 00021403 */ sra $v0, $v0, 0x10 -/* 427DBC 802A934C 28420033 */ slti $v0, $v0, 0x33 -/* 427DC0 802A9350 14400002 */ bnez $v0, .L802A935C -/* 427DC4 802A9354 24020032 */ addiu $v0, $zero, 0x32 -/* 427DC8 802A9358 A6220056 */ sh $v0, 0x56($s1) -.L802A935C: -/* 427DCC 802A935C 8E240004 */ lw $a0, 4($s1) -/* 427DD0 802A9360 86250056 */ lh $a1, 0x56($s1) -/* 427DD4 802A9364 0C051261 */ jal set_hud_element_render_pos -/* 427DD8 802A9368 86260058 */ lh $a2, 0x58($s1) -/* 427DDC 802A936C 8E240008 */ lw $a0, 8($s1) -/* 427DE0 802A9370 86260058 */ lh $a2, 0x58($s1) -/* 427DE4 802A9374 86250056 */ lh $a1, 0x56($s1) -/* 427DE8 802A9378 0C051261 */ jal set_hud_element_render_pos -/* 427DEC 802A937C 24C6001C */ addiu $a2, $a2, 0x1c -/* 427DF0 802A9380 080AA5B5 */ j L802A96D4_428144 -/* 427DF4 802A9384 00000000 */ nop -glabel L802A9388_427DF8 -/* 427DF8 802A9388 0C093EB1 */ jal btl_set_popup_duration -/* 427DFC 802A938C 24040063 */ addiu $a0, $zero, 0x63 -/* 427E00 802A9390 8622004E */ lh $v0, 0x4e($s1) -/* 427E04 802A9394 9623004E */ lhu $v1, 0x4e($s1) -/* 427E08 802A9398 10400003 */ beqz $v0, .L802A93A8 -/* 427E0C 802A939C 2462FFFF */ addiu $v0, $v1, -1 -/* 427E10 802A93A0 080AA5B5 */ j L802A96D4_428144 -/* 427E14 802A93A4 A622004E */ sh $v0, 0x4e($s1) -.L802A93A8: -/* 427E18 802A93A8 8E240004 */ lw $a0, 4($s1) -/* 427E1C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) -/* 427E20 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) -/* 427E24 802A93B4 0C0511FF */ jal set_hud_element_anim -/* 427E28 802A93B8 00000000 */ nop -/* 427E2C 802A93BC 3C048000 */ lui $a0, 0x8000 -/* 427E30 802A93C0 34840041 */ ori $a0, $a0, 0x41 -/* 427E34 802A93C4 0000282D */ daddu $a1, $zero, $zero -/* 427E38 802A93C8 00A0302D */ daddu $a2, $a1, $zero -/* 427E3C 802A93CC 96220052 */ lhu $v0, 0x52($s1) -/* 427E40 802A93D0 00A0382D */ daddu $a3, $a1, $zero -/* 427E44 802A93D4 A6200044 */ sh $zero, 0x44($s1) -/* 427E48 802A93D8 0C0526AE */ jal sfx_play_sound_with_params -/* 427E4C 802A93DC A6220054 */ sh $v0, 0x54($s1) -/* 427E50 802A93E0 2402000B */ addiu $v0, $zero, 0xb -/* 427E54 802A93E4 A622004C */ sh $v0, 0x4c($s1) -glabel L802A93E8_427E58 -/* 427E58 802A93E8 0C093EB1 */ jal btl_set_popup_duration -/* 427E5C 802A93EC 24040063 */ addiu $a0, $zero, 0x63 -/* 427E60 802A93F0 86220068 */ lh $v0, 0x68($s1) -/* 427E64 802A93F4 14400021 */ bnez $v0, .L802A947C -/* 427E68 802A93F8 00000000 */ nop -/* 427E6C 802A93FC 82220080 */ lb $v0, 0x80($s1) -/* 427E70 802A9400 00021040 */ sll $v0, $v0, 1 -/* 427E74 802A9404 02221021 */ addu $v0, $s1, $v0 -/* 427E78 802A9408 84430074 */ lh $v1, 0x74($v0) -/* 427E7C 802A940C 86220044 */ lh $v0, 0x44($s1) -/* 427E80 802A9410 14600002 */ bnez $v1, .L802A941C -/* 427E84 802A9414 0043001A */ div $zero, $v0, $v1 -/* 427E88 802A9418 0007000D */ break 7 -.L802A941C: -/* 427E8C 802A941C 2401FFFF */ addiu $at, $zero, -1 -/* 427E90 802A9420 14610004 */ bne $v1, $at, .L802A9434 -/* 427E94 802A9424 3C018000 */ lui $at, 0x8000 -/* 427E98 802A9428 14410002 */ bne $v0, $at, .L802A9434 -/* 427E9C 802A942C 00000000 */ nop -/* 427EA0 802A9430 0006000D */ break 6 -.L802A9434: -/* 427EA4 802A9434 00001012 */ mflo $v0 -/* 427EA8 802A9438 3C036666 */ lui $v1, 0x6666 -/* 427EAC 802A943C 34636667 */ ori $v1, $v1, 0x6667 -/* 427EB0 802A9440 00430018 */ mult $v0, $v1 -/* 427EB4 802A9444 000217C3 */ sra $v0, $v0, 0x1f -/* 427EB8 802A9448 00001810 */ mfhi $v1 -/* 427EBC 802A944C 000318C3 */ sra $v1, $v1, 3 -/* 427EC0 802A9450 00621823 */ subu $v1, $v1, $v0 -/* 427EC4 802A9454 00031880 */ sll $v1, $v1, 2 -/* 427EC8 802A9458 96220044 */ lhu $v0, 0x44($s1) -/* 427ECC 802A945C 3C01802B */ lui $at, %hi(D_802A9812_428282) -/* 427ED0 802A9460 00230821 */ addu $at, $at, $v1 -/* 427ED4 802A9464 94239812 */ lhu $v1, %lo(D_802A9812_428282)($at) -/* 427ED8 802A9468 00431023 */ subu $v0, $v0, $v1 -/* 427EDC 802A946C A6220044 */ sh $v0, 0x44($s1) -/* 427EE0 802A9470 00021400 */ sll $v0, $v0, 0x10 -/* 427EE4 802A9474 04420001 */ bltzl $v0, .L802A947C -/* 427EE8 802A9478 A6200044 */ sh $zero, 0x44($s1) -.L802A947C: -/* 427EEC 802A947C 8E420214 */ lw $v0, 0x214($s2) -/* 427EF0 802A9480 30428000 */ andi $v0, $v0, 0x8000 -/* 427EF4 802A9484 10400039 */ beqz $v0, .L802A956C -/* 427EF8 802A9488 24020001 */ addiu $v0, $zero, 1 -/* 427EFC 802A948C 86230064 */ lh $v1, 0x64($s1) -/* 427F00 802A9490 10620018 */ beq $v1, $v0, .L802A94F4 -/* 427F04 802A9494 28620002 */ slti $v0, $v1, 2 -/* 427F08 802A9498 50400005 */ beql $v0, $zero, .L802A94B0 -/* 427F0C 802A949C 24020002 */ addiu $v0, $zero, 2 -/* 427F10 802A94A0 10600007 */ beqz $v1, .L802A94C0 -/* 427F14 802A94A4 3C0451EB */ lui $a0, 0x51eb -/* 427F18 802A94A8 080AA55B */ j .L802A956C -/* 427F1C 802A94AC 00000000 */ nop -.L802A94B0: -/* 427F20 802A94B0 10620019 */ beq $v1, $v0, .L802A9518 -/* 427F24 802A94B4 3C0451EB */ lui $a0, 0x51eb -/* 427F28 802A94B8 080AA55B */ j .L802A956C -/* 427F2C 802A94BC 00000000 */ nop -.L802A94C0: -/* 427F30 802A94C0 86220050 */ lh $v0, 0x50($s1) -/* 427F34 802A94C4 8E430434 */ lw $v1, 0x434($s2) -/* 427F38 802A94C8 00021080 */ sll $v0, $v0, 2 -/* 427F3C 802A94CC 00431021 */ addu $v0, $v0, $v1 -/* 427F40 802A94D0 8C430000 */ lw $v1, ($v0) -/* 427F44 802A94D4 3484851F */ ori $a0, $a0, 0x851f -/* 427F48 802A94D8 00031100 */ sll $v0, $v1, 4 -/* 427F4C 802A94DC 00431023 */ subu $v0, $v0, $v1 -/* 427F50 802A94E0 00021080 */ sll $v0, $v0, 2 -/* 427F54 802A94E4 00431023 */ subu $v0, $v0, $v1 -/* 427F58 802A94E8 00021080 */ sll $v0, $v0, 2 -/* 427F5C 802A94EC 080AA552 */ j .L802A9548 -/* 427F60 802A94F0 00431023 */ subu $v0, $v0, $v1 -.L802A94F4: -/* 427F64 802A94F4 86220050 */ lh $v0, 0x50($s1) -/* 427F68 802A94F8 8E430434 */ lw $v1, 0x434($s2) -/* 427F6C 802A94FC 00021080 */ sll $v0, $v0, 2 -/* 427F70 802A9500 00431021 */ addu $v0, $v0, $v1 -/* 427F74 802A9504 8C420000 */ lw $v0, ($v0) -/* 427F78 802A9508 96230044 */ lhu $v1, 0x44($s1) -/* 427F7C 802A950C 000210C0 */ sll $v0, $v0, 3 -/* 427F80 802A9510 080AA55A */ j .L802A9568 -/* 427F84 802A9514 00621821 */ addu $v1, $v1, $v0 -.L802A9518: -/* 427F88 802A9518 86220050 */ lh $v0, 0x50($s1) -/* 427F8C 802A951C 8E430434 */ lw $v1, 0x434($s2) -/* 427F90 802A9520 00021080 */ sll $v0, $v0, 2 -/* 427F94 802A9524 00431021 */ addu $v0, $v0, $v1 -/* 427F98 802A9528 8C430000 */ lw $v1, ($v0) -/* 427F9C 802A952C 3484851F */ ori $a0, $a0, 0x851f -/* 427FA0 802A9530 00031040 */ sll $v0, $v1, 1 -/* 427FA4 802A9534 00431021 */ addu $v0, $v0, $v1 -/* 427FA8 802A9538 000210C0 */ sll $v0, $v0, 3 -/* 427FAC 802A953C 00431023 */ subu $v0, $v0, $v1 -/* 427FB0 802A9540 000210C0 */ sll $v0, $v0, 3 -/* 427FB4 802A9544 00431021 */ addu $v0, $v0, $v1 -.L802A9548: -/* 427FB8 802A9548 00021080 */ sll $v0, $v0, 2 -/* 427FBC 802A954C 00440018 */ mult $v0, $a0 -/* 427FC0 802A9550 000217C3 */ sra $v0, $v0, 0x1f -/* 427FC4 802A9554 96230044 */ lhu $v1, 0x44($s1) -/* 427FC8 802A9558 00004810 */ mfhi $t1 -/* 427FCC 802A955C 00092143 */ sra $a0, $t1, 5 -/* 427FD0 802A9560 00822023 */ subu $a0, $a0, $v0 -/* 427FD4 802A9564 00641821 */ addu $v1, $v1, $a0 -.L802A9568: -/* 427FD8 802A9568 A6230044 */ sh $v1, 0x44($s1) -.L802A956C: -/* 427FDC 802A956C 86220044 */ lh $v0, 0x44($s1) -/* 427FE0 802A9570 28422711 */ slti $v0, $v0, 0x2711 -/* 427FE4 802A9574 14400010 */ bnez $v0, .L802A95B8 -/* 427FE8 802A9578 3C1051EB */ lui $s0, 0x51eb -/* 427FEC 802A957C 8E30000C */ lw $s0, 0xc($s1) -/* 427FF0 802A9580 86250056 */ lh $a1, 0x56($s1) -/* 427FF4 802A9584 86260058 */ lh $a2, 0x58($s1) -/* 427FF8 802A9588 24022710 */ addiu $v0, $zero, 0x2710 -/* 427FFC 802A958C A6220044 */ sh $v0, 0x44($s1) -/* 428000 802A9590 24020001 */ addiu $v0, $zero, 1 -/* 428004 802A9594 A6220068 */ sh $v0, 0x68($s1) -/* 428008 802A9598 0200202D */ daddu $a0, $s0, $zero -/* 42800C 802A959C 24A50032 */ addiu $a1, $a1, 0x32 -/* 428010 802A95A0 0C051261 */ jal set_hud_element_render_pos -/* 428014 802A95A4 24C6001C */ addiu $a2, $a2, 0x1c -/* 428018 802A95A8 0200202D */ daddu $a0, $s0, $zero -/* 42801C 802A95AC 0C05128B */ jal clear_hud_element_flags -/* 428020 802A95B0 24050002 */ addiu $a1, $zero, 2 -/* 428024 802A95B4 3C1051EB */ lui $s0, 0x51eb -.L802A95B8: -/* 428028 802A95B8 3610851F */ ori $s0, $s0, 0x851f -/* 42802C 802A95BC 96230044 */ lhu $v1, 0x44($s1) -/* 428030 802A95C0 3C048000 */ lui $a0, 0x8000 -/* 428034 802A95C4 00031C00 */ sll $v1, $v1, 0x10 -/* 428038 802A95C8 00031403 */ sra $v0, $v1, 0x10 -/* 42803C 802A95CC 00500018 */ mult $v0, $s0 -/* 428040 802A95D0 34840041 */ ori $a0, $a0, 0x41 -/* 428044 802A95D4 0000282D */ daddu $a1, $zero, $zero -/* 428048 802A95D8 00A0302D */ daddu $a2, $a1, $zero -/* 42804C 802A95DC 00031FC3 */ sra $v1, $v1, 0x1f -/* 428050 802A95E0 00004810 */ mfhi $t1 -/* 428054 802A95E4 00094143 */ sra $t0, $t1, 5 -/* 428058 802A95E8 01034023 */ subu $t0, $t0, $v1 -/* 42805C 802A95EC 00081600 */ sll $v0, $t0, 0x18 -/* 428060 802A95F0 00021603 */ sra $v0, $v0, 0x18 -/* 428064 802A95F4 00023840 */ sll $a3, $v0, 1 -/* 428068 802A95F8 00E23821 */ addu $a3, $a3, $v0 -/* 42806C 802A95FC 00073880 */ sll $a3, $a3, 2 -/* 428070 802A9600 0C0526F9 */ jal sfx_adjust_env_sound_params -/* 428074 802A9604 A2480084 */ sb $t0, 0x84($s2) -/* 428078 802A9608 86220054 */ lh $v0, 0x54($s1) -/* 42807C 802A960C 96230054 */ lhu $v1, 0x54($s1) -/* 428080 802A9610 1440002C */ bnez $v0, .L802A96C4 -/* 428084 802A9614 2462FFFF */ addiu $v0, $v1, -1 -/* 428088 802A9618 96220044 */ lhu $v0, 0x44($s1) -/* 42808C 802A961C 00021C00 */ sll $v1, $v0, 0x10 -/* 428090 802A9620 00031403 */ sra $v0, $v1, 0x10 -/* 428094 802A9624 14400003 */ bnez $v0, .L802A9634 -/* 428098 802A9628 00500018 */ mult $v0, $s0 -/* 42809C 802A962C 080AA591 */ j .L802A9644 -/* 4280A0 802A9630 2402FFFF */ addiu $v0, $zero, -1 -.L802A9634: -/* 4280A4 802A9634 00031FC3 */ sra $v1, $v1, 0x1f -/* 4280A8 802A9638 00004810 */ mfhi $t1 -/* 4280AC 802A963C 00091143 */ sra $v0, $t1, 5 -/* 4280B0 802A9640 00431023 */ subu $v0, $v0, $v1 -.L802A9644: -/* 4280B4 802A9644 A2420081 */ sb $v0, 0x81($s2) -/* 4280B8 802A9648 82220080 */ lb $v0, 0x80($s1) -/* 4280BC 802A964C 2442FFFF */ addiu $v0, $v0, -1 -/* 4280C0 802A9650 00021040 */ sll $v0, $v0, 1 -/* 4280C4 802A9654 02221021 */ addu $v0, $s1, $v0 -/* 4280C8 802A9658 84430074 */ lh $v1, 0x74($v0) -/* 4280CC 802A965C 82420081 */ lb $v0, 0x81($s2) -/* 4280D0 802A9660 0062102A */ slt $v0, $v1, $v0 -/* 4280D4 802A9664 14400002 */ bnez $v0, .L802A9670 -/* 4280D8 802A9668 24020001 */ addiu $v0, $zero, 1 -/* 4280DC 802A966C 2402FFFE */ addiu $v0, $zero, -2 -.L802A9670: -/* 4280E0 802A9670 A2420086 */ sb $v0, 0x86($s2) -/* 4280E4 802A9674 82430081 */ lb $v1, 0x81($s2) -/* 4280E8 802A9678 24020064 */ addiu $v0, $zero, 0x64 -/* 4280EC 802A967C 14620004 */ bne $v1, $v0, .L802A9690 -/* 4280F0 802A9680 3C048000 */ lui $a0, 0x8000 -/* 4280F4 802A9684 0C09A458 */ jal func_80269160 -/* 4280F8 802A9688 00000000 */ nop -/* 4280FC 802A968C 3C048000 */ lui $a0, 0x8000 -.L802A9690: -/* 428100 802A9690 0C05271B */ jal sfx_stop_sound -/* 428104 802A9694 34840041 */ ori $a0, $a0, 0x41 -/* 428108 802A9698 0C093EB1 */ jal btl_set_popup_duration -/* 42810C 802A969C 0000202D */ daddu $a0, $zero, $zero -/* 428110 802A96A0 24020005 */ addiu $v0, $zero, 5 -/* 428114 802A96A4 A6220054 */ sh $v0, 0x54($s1) -/* 428118 802A96A8 2402000C */ addiu $v0, $zero, 0xc -/* 42811C 802A96AC 080AA5B5 */ j L802A96D4_428144 -/* 428120 802A96B0 A622004C */ sh $v0, 0x4c($s1) -glabel L802A96B4_428124 -/* 428124 802A96B4 86220054 */ lh $v0, 0x54($s1) -/* 428128 802A96B8 96230054 */ lhu $v1, 0x54($s1) -/* 42812C 802A96BC 10400003 */ beqz $v0, .L802A96CC -/* 428130 802A96C0 2462FFFF */ addiu $v0, $v1, -1 -.L802A96C4: -/* 428134 802A96C4 080AA5B5 */ j L802A96D4_428144 -/* 428138 802A96C8 A6220054 */ sh $v0, 0x54($s1) -.L802A96CC: -/* 42813C 802A96CC 0C09A327 */ jal func_80268C9C -/* 428140 802A96D0 00000000 */ nop -glabel L802A96D4_428144 -/* 428144 802A96D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 428148 802A96D8 8FB20018 */ lw $s2, 0x18($sp) -/* 42814C 802A96DC 8FB10014 */ lw $s1, 0x14($sp) -/* 428150 802A96E0 8FB00010 */ lw $s0, 0x10($sp) -/* 428154 802A96E4 03E00008 */ jr $ra -/* 428158 802A96E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A96EC_42815C.s b/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A96EC_42815C.s deleted file mode 100644 index 9e981ce3b3..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/bomb/func_802A96EC_42815C.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A96EC_42815C -/* 42815C 802A96EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 428160 802A96F0 AFB1001C */ sw $s1, 0x1c($sp) -/* 428164 802A96F4 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 428168 802A96F8 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 42816C 802A96FC AFBF0020 */ sw $ra, 0x20($sp) -/* 428170 802A9700 AFB00018 */ sw $s0, 0x18($sp) -/* 428174 802A9704 0C0511EA */ jal draw_hud_element_clipped -/* 428178 802A9708 8E240004 */ lw $a0, 4($s1) -/* 42817C 802A970C 8E300008 */ lw $s0, 8($s1) -/* 428180 802A9710 0C0511EA */ jal draw_hud_element_clipped -/* 428184 802A9714 0200202D */ daddu $a0, $s0, $zero -/* 428188 802A9718 0200202D */ daddu $a0, $s0, $zero -/* 42818C 802A971C 27A50010 */ addiu $a1, $sp, 0x10 -/* 428190 802A9720 0C05126B */ jal get_hud_element_render_pos -/* 428194 802A9724 27A60014 */ addiu $a2, $sp, 0x14 -/* 428198 802A9728 86220068 */ lh $v0, 0x68($s1) -/* 42819C 802A972C 14400011 */ bnez $v0, .L802A9774 -/* 4281A0 802A9730 3C0451EB */ lui $a0, 0x51eb -/* 4281A4 802A9734 96230044 */ lhu $v1, 0x44($s1) -/* 4281A8 802A9738 3484851F */ ori $a0, $a0, 0x851f -/* 4281AC 802A973C 00031C00 */ sll $v1, $v1, 0x10 -/* 4281B0 802A9740 00031403 */ sra $v0, $v1, 0x10 -/* 4281B4 802A9744 00440018 */ mult $v0, $a0 -/* 4281B8 802A9748 8FA50014 */ lw $a1, 0x14($sp) -/* 4281BC 802A974C 00031FC3 */ sra $v1, $v1, 0x1f -/* 4281C0 802A9750 8FA40010 */ lw $a0, 0x10($sp) -/* 4281C4 802A9754 00003810 */ mfhi $a3 -/* 4281C8 802A9758 00073143 */ sra $a2, $a3, 5 -/* 4281CC 802A975C 00C33023 */ subu $a2, $a2, $v1 -/* 4281D0 802A9760 00063400 */ sll $a2, $a2, 0x10 -/* 4281D4 802A9764 0C09A1DC */ jal func_80268770 -/* 4281D8 802A9768 00063403 */ sra $a2, $a2, 0x10 -/* 4281DC 802A976C 080AA5EB */ j .L802A97AC -/* 4281E0 802A9770 00000000 */ nop -.L802A9774: -/* 4281E4 802A9774 96230044 */ lhu $v1, 0x44($s1) -/* 4281E8 802A9778 3484851F */ ori $a0, $a0, 0x851f -/* 4281EC 802A977C 00031C00 */ sll $v1, $v1, 0x10 -/* 4281F0 802A9780 00031403 */ sra $v0, $v1, 0x10 -/* 4281F4 802A9784 00440018 */ mult $v0, $a0 -/* 4281F8 802A9788 8FA50014 */ lw $a1, 0x14($sp) -/* 4281FC 802A978C 00031FC3 */ sra $v1, $v1, 0x1f -/* 428200 802A9790 8FA40010 */ lw $a0, 0x10($sp) -/* 428204 802A9794 00003810 */ mfhi $a3 -/* 428208 802A9798 00073143 */ sra $a2, $a3, 5 -/* 42820C 802A979C 00C33023 */ subu $a2, $a2, $v1 -/* 428210 802A97A0 00063400 */ sll $a2, $a2, 0x10 -/* 428214 802A97A4 0C09A203 */ jal func_8026880C -/* 428218 802A97A8 00063403 */ sra $a2, $a2, 0x10 -.L802A97AC: -/* 42821C 802A97AC 8E24000C */ lw $a0, 0xc($s1) -/* 428220 802A97B0 0C0511EA */ jal draw_hud_element_clipped -/* 428224 802A97B4 00000000 */ nop -/* 428228 802A97B8 8FBF0020 */ lw $ra, 0x20($sp) -/* 42822C 802A97BC 8FB1001C */ lw $s1, 0x1c($sp) -/* 428230 802A97C0 8FB00018 */ lw $s0, 0x18($sp) -/* 428234 802A97C4 03E00008 */ jr $ra -/* 428238 802A97C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A96DC_42684C.s b/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A96DC_42684C.s deleted file mode 100644 index 9db62c8dbe..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/dizzy_shell/func_802A96DC_42684C.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A96DC_42684C -/* 42684C 802A96DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 426850 802A96E0 AFB1001C */ sw $s1, 0x1c($sp) -/* 426854 802A96E4 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 426858 802A96E8 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 42685C 802A96EC AFBF0020 */ sw $ra, 0x20($sp) -/* 426860 802A96F0 AFB00018 */ sw $s0, 0x18($sp) -/* 426864 802A96F4 0C0511EA */ jal draw_hud_element_clipped -/* 426868 802A96F8 8E240004 */ lw $a0, 4($s1) -/* 42686C 802A96FC 8E300008 */ lw $s0, 8($s1) -/* 426870 802A9700 0C0511EA */ jal draw_hud_element_clipped -/* 426874 802A9704 0200202D */ daddu $a0, $s0, $zero -/* 426878 802A9708 0200202D */ daddu $a0, $s0, $zero -/* 42687C 802A970C 27A50010 */ addiu $a1, $sp, 0x10 -/* 426880 802A9710 0C05126B */ jal get_hud_element_render_pos -/* 426884 802A9714 27A60014 */ addiu $a2, $sp, 0x14 -/* 426888 802A9718 86220068 */ lh $v0, 0x68($s1) -/* 42688C 802A971C 14400011 */ bnez $v0, .L802A9764 -/* 426890 802A9720 3C0451EB */ lui $a0, 0x51eb -/* 426894 802A9724 96230044 */ lhu $v1, 0x44($s1) -/* 426898 802A9728 3484851F */ ori $a0, $a0, 0x851f -/* 42689C 802A972C 00031C00 */ sll $v1, $v1, 0x10 -/* 4268A0 802A9730 00031403 */ sra $v0, $v1, 0x10 -/* 4268A4 802A9734 00440018 */ mult $v0, $a0 -/* 4268A8 802A9738 8FA50014 */ lw $a1, 0x14($sp) -/* 4268AC 802A973C 00031FC3 */ sra $v1, $v1, 0x1f -/* 4268B0 802A9740 8FA40010 */ lw $a0, 0x10($sp) -/* 4268B4 802A9744 00003810 */ mfhi $a3 -/* 4268B8 802A9748 00073143 */ sra $a2, $a3, 5 -/* 4268BC 802A974C 00C33023 */ subu $a2, $a2, $v1 -/* 4268C0 802A9750 00063400 */ sll $a2, $a2, 0x10 -/* 4268C4 802A9754 0C09A1DC */ jal func_80268770 -/* 4268C8 802A9758 00063403 */ sra $a2, $a2, 0x10 -/* 4268CC 802A975C 080AA5E7 */ j .L802A979C -/* 4268D0 802A9760 00000000 */ nop -.L802A9764: -/* 4268D4 802A9764 96230044 */ lhu $v1, 0x44($s1) -/* 4268D8 802A9768 3484851F */ ori $a0, $a0, 0x851f -/* 4268DC 802A976C 00031C00 */ sll $v1, $v1, 0x10 -/* 4268E0 802A9770 00031403 */ sra $v0, $v1, 0x10 -/* 4268E4 802A9774 00440018 */ mult $v0, $a0 -/* 4268E8 802A9778 8FA50014 */ lw $a1, 0x14($sp) -/* 4268EC 802A977C 00031FC3 */ sra $v1, $v1, 0x1f -/* 4268F0 802A9780 8FA40010 */ lw $a0, 0x10($sp) -/* 4268F4 802A9784 00003810 */ mfhi $a3 -/* 4268F8 802A9788 00073143 */ sra $a2, $a3, 5 -/* 4268FC 802A978C 00C33023 */ subu $a2, $a2, $v1 -/* 426900 802A9790 00063400 */ sll $a2, $a2, 0x10 -/* 426904 802A9794 0C09A203 */ jal func_8026880C -/* 426908 802A9798 00063403 */ sra $a2, $a2, 0x10 -.L802A979C: -/* 42690C 802A979C 8E24000C */ lw $a0, 0xc($s1) -/* 426910 802A97A0 0C0511EA */ jal draw_hud_element_clipped -/* 426914 802A97A4 00000000 */ nop -/* 426918 802A97A8 8FBF0020 */ lw $ra, 0x20($sp) -/* 42691C 802A97AC 8FB1001C */ lw $s1, 0x1c($sp) -/* 426920 802A97B0 8FB00018 */ lw $s0, 0x18($sp) -/* 426924 802A97B4 03E00008 */ jr $ra -/* 426928 802A97B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9834_427204.s b/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9834_427204.s deleted file mode 100644 index d1f97131eb..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/fire_shell/func_802A9834_427204.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A9834_427204 -/* 427204 802A9834 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 427208 802A9838 AFB1001C */ sw $s1, 0x1c($sp) -/* 42720C 802A983C 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 427210 802A9840 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 427214 802A9844 AFBF0020 */ sw $ra, 0x20($sp) -/* 427218 802A9848 AFB00018 */ sw $s0, 0x18($sp) -/* 42721C 802A984C 0C0511EA */ jal draw_hud_element_clipped -/* 427220 802A9850 8E240004 */ lw $a0, 4($s1) -/* 427224 802A9854 8E300008 */ lw $s0, 8($s1) -/* 427228 802A9858 0C0511EA */ jal draw_hud_element_clipped -/* 42722C 802A985C 0200202D */ daddu $a0, $s0, $zero -/* 427230 802A9860 0200202D */ daddu $a0, $s0, $zero -/* 427234 802A9864 27A50010 */ addiu $a1, $sp, 0x10 -/* 427238 802A9868 0C05126B */ jal get_hud_element_render_pos -/* 42723C 802A986C 27A60014 */ addiu $a2, $sp, 0x14 -/* 427240 802A9870 86220068 */ lh $v0, 0x68($s1) -/* 427244 802A9874 14400011 */ bnez $v0, .L802A98BC -/* 427248 802A9878 3C0451EB */ lui $a0, 0x51eb -/* 42724C 802A987C 96230044 */ lhu $v1, 0x44($s1) -/* 427250 802A9880 3484851F */ ori $a0, $a0, 0x851f -/* 427254 802A9884 00031C00 */ sll $v1, $v1, 0x10 -/* 427258 802A9888 00031403 */ sra $v0, $v1, 0x10 -/* 42725C 802A988C 00440018 */ mult $v0, $a0 -/* 427260 802A9890 8FA50014 */ lw $a1, 0x14($sp) -/* 427264 802A9894 00031FC3 */ sra $v1, $v1, 0x1f -/* 427268 802A9898 8FA40010 */ lw $a0, 0x10($sp) -/* 42726C 802A989C 00003810 */ mfhi $a3 -/* 427270 802A98A0 00073143 */ sra $a2, $a3, 5 -/* 427274 802A98A4 00C33023 */ subu $a2, $a2, $v1 -/* 427278 802A98A8 00063400 */ sll $a2, $a2, 0x10 -/* 42727C 802A98AC 0C09A1DC */ jal func_80268770 -/* 427280 802A98B0 00063403 */ sra $a2, $a2, 0x10 -/* 427284 802A98B4 080AA63D */ j .L802A98F4 -/* 427288 802A98B8 00000000 */ nop -.L802A98BC: -/* 42728C 802A98BC 96230044 */ lhu $v1, 0x44($s1) -/* 427290 802A98C0 3484851F */ ori $a0, $a0, 0x851f -/* 427294 802A98C4 00031C00 */ sll $v1, $v1, 0x10 -/* 427298 802A98C8 00031403 */ sra $v0, $v1, 0x10 -/* 42729C 802A98CC 00440018 */ mult $v0, $a0 -/* 4272A0 802A98D0 8FA50014 */ lw $a1, 0x14($sp) -/* 4272A4 802A98D4 00031FC3 */ sra $v1, $v1, 0x1f -/* 4272A8 802A98D8 8FA40010 */ lw $a0, 0x10($sp) -/* 4272AC 802A98DC 00003810 */ mfhi $a3 -/* 4272B0 802A98E0 00073143 */ sra $a2, $a3, 5 -/* 4272B4 802A98E4 00C33023 */ subu $a2, $a2, $v1 -/* 4272B8 802A98E8 00063400 */ sll $a2, $a2, 0x10 -/* 4272BC 802A98EC 0C09A203 */ jal func_8026880C -/* 4272C0 802A98F0 00063403 */ sra $a2, $a2, 0x10 -.L802A98F4: -/* 4272C4 802A98F4 8E24000C */ lw $a0, 0xc($s1) -/* 4272C8 802A98F8 0C0511EA */ jal draw_hud_element_clipped -/* 4272CC 802A98FC 00000000 */ nop -/* 4272D0 802A9900 8FBF0020 */ lw $ra, 0x20($sp) -/* 4272D4 802A9904 8FB1001C */ lw $s1, 0x1c($sp) -/* 4272D8 802A9908 8FB00018 */ lw $s0, 0x18($sp) -/* 4272DC 802A990C 03E00008 */ jr $ra -/* 4272E0 802A9910 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A973C_42F55C.s b/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A973C_42F55C.s deleted file mode 100644 index 5b59bf4a0b..0000000000 --- a/ver/us/asm/nonmatchings/battle/action_cmd/spiny_surge/func_802A973C_42F55C.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802A973C_42F55C -/* 42F55C 802A973C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 42F560 802A9740 AFB1001C */ sw $s1, 0x1c($sp) -/* 42F564 802A9744 3C11802A */ lui $s1, %hi(gActionCommandStatus) -/* 42F568 802A9748 2631FBE0 */ addiu $s1, $s1, %lo(gActionCommandStatus) -/* 42F56C 802A974C AFBF0020 */ sw $ra, 0x20($sp) -/* 42F570 802A9750 AFB00018 */ sw $s0, 0x18($sp) -/* 42F574 802A9754 0C0511EA */ jal draw_hud_element_clipped -/* 42F578 802A9758 8E240004 */ lw $a0, 4($s1) -/* 42F57C 802A975C 8E300008 */ lw $s0, 8($s1) -/* 42F580 802A9760 0C0511EA */ jal draw_hud_element_clipped -/* 42F584 802A9764 0200202D */ daddu $a0, $s0, $zero -/* 42F588 802A9768 0200202D */ daddu $a0, $s0, $zero -/* 42F58C 802A976C 27A50010 */ addiu $a1, $sp, 0x10 -/* 42F590 802A9770 0C05126B */ jal get_hud_element_render_pos -/* 42F594 802A9774 27A60014 */ addiu $a2, $sp, 0x14 -/* 42F598 802A9778 86220068 */ lh $v0, 0x68($s1) -/* 42F59C 802A977C 14400011 */ bnez $v0, .L802A97C4 -/* 42F5A0 802A9780 3C0451EB */ lui $a0, 0x51eb -/* 42F5A4 802A9784 96230044 */ lhu $v1, 0x44($s1) -/* 42F5A8 802A9788 3484851F */ ori $a0, $a0, 0x851f -/* 42F5AC 802A978C 00031C00 */ sll $v1, $v1, 0x10 -/* 42F5B0 802A9790 00031403 */ sra $v0, $v1, 0x10 -/* 42F5B4 802A9794 00440018 */ mult $v0, $a0 -/* 42F5B8 802A9798 8FA50014 */ lw $a1, 0x14($sp) -/* 42F5BC 802A979C 00031FC3 */ sra $v1, $v1, 0x1f -/* 42F5C0 802A97A0 8FA40010 */ lw $a0, 0x10($sp) -/* 42F5C4 802A97A4 00003810 */ mfhi $a3 -/* 42F5C8 802A97A8 00073143 */ sra $a2, $a3, 5 -/* 42F5CC 802A97AC 00C33023 */ subu $a2, $a2, $v1 -/* 42F5D0 802A97B0 00063400 */ sll $a2, $a2, 0x10 -/* 42F5D4 802A97B4 0C09A1DC */ jal func_80268770 -/* 42F5D8 802A97B8 00063403 */ sra $a2, $a2, 0x10 -/* 42F5DC 802A97BC 080AA5FF */ j .L802A97FC -/* 42F5E0 802A97C0 00000000 */ nop -.L802A97C4: -/* 42F5E4 802A97C4 96230044 */ lhu $v1, 0x44($s1) -/* 42F5E8 802A97C8 3484851F */ ori $a0, $a0, 0x851f -/* 42F5EC 802A97CC 00031C00 */ sll $v1, $v1, 0x10 -/* 42F5F0 802A97D0 00031403 */ sra $v0, $v1, 0x10 -/* 42F5F4 802A97D4 00440018 */ mult $v0, $a0 -/* 42F5F8 802A97D8 8FA50014 */ lw $a1, 0x14($sp) -/* 42F5FC 802A97DC 00031FC3 */ sra $v1, $v1, 0x1f -/* 42F600 802A97E0 8FA40010 */ lw $a0, 0x10($sp) -/* 42F604 802A97E4 00003810 */ mfhi $a3 -/* 42F608 802A97E8 00073143 */ sra $a2, $a3, 5 -/* 42F60C 802A97EC 00C33023 */ subu $a2, $a2, $v1 -/* 42F610 802A97F0 00063400 */ sll $a2, $a2, 0x10 -/* 42F614 802A97F4 0C09A203 */ jal func_8026880C -/* 42F618 802A97F8 00063403 */ sra $a2, $a2, 0x10 -.L802A97FC: -/* 42F61C 802A97FC 8E24000C */ lw $a0, 0xc($s1) -/* 42F620 802A9800 0C0511EA */ jal draw_hud_element_clipped -/* 42F624 802A9804 00000000 */ nop -/* 42F628 802A9808 8FBF0020 */ lw $ra, 0x20($sp) -/* 42F62C 802A980C 8FB1001C */ lw $s1, 0x1c($sp) -/* 42F630 802A9810 8FB00018 */ lw $s0, 0x18($sp) -/* 42F634 802A9814 03E00008 */ jr $ra -/* 42F638 802A9818 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 40af477650..1c704d259c 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -3562,7 +3562,7 @@ segments: overlay: True subsegments: - [0x427A70, c, bomb] - - [0x428280, data] + - [0x428280] - type: code start: 0x4282E0 vram: 0x802A9000 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 69adc1dab7..ee136a07af 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -5719,13 +5719,13 @@ action_command_07_FreeHudElements = 0x802A959C; // type:func rom:0x4260EC func_802A9000_426170 = 0x802A9000; // type:func rom:0x426170 action_command_dizzy_shell_MashActionCommandInit = 0x802A9170; // type:func rom:0x4262E0 func_802A928C_4263FC = 0x802A928C; // type:func rom:0x4263FC -func_802A96DC_42684C = 0x802A96DC; // type:func rom:0x42684C +action_command_dizzy_shell_UnkActionCommandFunc1 = 0x802A96DC; // type:func rom:0x42684C action_command_dizzy_shell_FreeHudElements = 0x802A97BC; // type:func rom:0x42692C D_802A9802_426972 = 0x802A9802; // type:data rom:0x426972 func_802A9000_4269D0 = 0x802A9000; // type:func rom:0x4269D0 action_command_fire_shell_MashActionCommandInit = 0x802A9178; // type:func rom:0x426B48 func_802A9294_426C64 = 0x802A9294; // type:func rom:0x426C64 -func_802A9834_427204 = 0x802A9834; // type:func rom:0x427204 +action_command_fire_shell_UnkActionCommandFunc1 = 0x802A9834; // type:func rom:0x427204 action_command_fire_shell_FreeHudElements = 0x802A9914; // type:func rom:0x4272E4 D_802A9952_427322 = 0x802A9952; // type:data rom:0x427322 D_802A9964_427334 = 0x802A9964; // type:data rom:0x427334 @@ -5734,12 +5734,12 @@ D_802A9988_427358 = 0x802A9988; // type:data rom:0x427358 func_802A9000_4273B0 = 0x802A9000; // type:func rom:0x4273B0 action_command_0A_MashActionCommandInit = 0x802A9170; // type:func rom:0x427520 func_802A928C_42763C = 0x802A928C; // type:func rom:0x42763C -func_802A955C_42790C = 0x802A955C; // type:func rom:0x42790C +action_command_0A_UnkActionCommandFunc1 = 0x802A955C; // type:func rom:0x42790C action_command_0A_FreeHudElements = 0x802A963C; // type:func rom:0x4279EC func_802A9000_427A70 = 0x802A9000; // type:func rom:0x427A70 action_command_bomb_MashActionCommandInit = 0x802A9170; // type:func rom:0x427BE0 func_802A928C_427CFC = 0x802A928C; // type:func rom:0x427CFC -func_802A96EC_42815C = 0x802A96EC; // type:func rom:0x42815C +action_command_bomb_UnkActionCommandFunc1 = 0x802A96EC; // type:func rom:0x42815C action_command_bomb_FreeHudElements = 0x802A97CC; // type:func rom:0x42823C D_802A9812_428282 = 0x802A9812; // type:data rom:0x428282 action_command_body_slam_CreateHudElements = 0x802A9000; // type:func rom:0x4282E0 @@ -5756,7 +5756,7 @@ D_802A9852_4292C2 = 0x802A9852; // type:data rom:0x4292C2 func_802A9000_429320 = 0x802A9000; // type:func rom:0x429320 action_command_air_raid_MashActionCommandInit = 0x802A9178; // type:func rom:0x429498 func_802A9294_4295B4 = 0x802A9294; // type:func rom:0x4295B4 -func_802A984C_429B6C = 0x802A984C; // type:func rom:0x429B6C +action_command_air_raid_UnkActionCommandFunc1 = 0x802A984C; // type:func rom:0x429B6C action_command_air_raid_FreeHudElements = 0x802A992C; // type:func rom:0x429C4C D_802A9972_429C92 = 0x802A9972; // type:data rom:0x429C92 D_802A9984_429CA4 = 0x802A9984; // type:data rom:0x429CA4 @@ -5801,7 +5801,7 @@ D_802A9932_42E342 = 0x802A9932; // type:data rom:0x42E342 func_802A9000_42E3A0 = 0x802A9000; // type:func rom:0x42E3A0 action_command_smack_MashActionCommandInit = 0x802A917C; // type:func rom:0x42E51C func_802A9298_42E638 = 0x802A9298; // type:func rom:0x42E638 -func_802A98B0_42EC50 = 0x802A98B0; // type:func rom:0x42EC50 +action_command_smack_UnkActionCommandFunc1 = 0x802A98B0; // type:func rom:0x42EC50 action_command_smack_FreeHudElements = 0x802A9990; // type:func rom:0x42ED30 D_802A99D2_42ED72 = 0x802A99D2; // type:data rom:0x42ED72 D_802A99E4_42ED84 = 0x802A99E4; // type:data rom:0x42ED84 @@ -5811,7 +5811,7 @@ D_802A9A20_42EDC0 = 0x802A9A20; // type:data rom:0x42EDC0 func_802A9000_42EE20 = 0x802A9000; // type:func rom:0x42EE20 func_802A916C_42EF8C = 0x802A916C; // type:func rom:0x42EF8C func_802A9254_42F074 = 0x802A9254; // type:func rom:0x42F074 -func_802A973C_42F55C = 0x802A973C; // type:func rom:0x42F55C +action_command_spiny_surge_UnkActionCommandFunc1 = 0x802A973C; // type:func rom:0x42F55C action_command_spiny_surge_FreeHudElements = 0x802A981C; // type:func rom:0x42F63C D_802A9862_42F682 = 0x802A9862; // type:data rom:0x42F682 func_802A9000_42F6E0 = 0x802A9000; // type:func rom:0x42F6E0 @@ -5823,7 +5823,7 @@ D_802A98E2_42FFC2 = 0x802A98E2; // type:data rom:0x42FFC2 func_802A9000_430020 = 0x802A9000; // type:func rom:0x430020 action_command_spook_MashActionCommandInit = 0x802A917C; // type:func rom:0x43019C func_802A9298_4302B8 = 0x802A9298; // type:func rom:0x4302B8 -func_802A97FC_43081C = 0x802A97FC; // type:func rom:0x43081C +action_command_spook_UnkActionCommandFunc1 = 0x802A97FC; // type:func rom:0x43081C action_command_spook_FreeHudElements = 0x802A98DC; // type:func rom:0x4308FC D_802A9922_430942 = 0x802A9922; // type:data rom:0x430942 b_area_kmr_part_1_goomba_angle_calculate = 0x80218000; // type:func rom:0x4309A0