From c0694d26f112513d413f01a4e9190aa40f3ee3ed Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 28 May 2022 07:13:30 -0400 Subject: [PATCH] House cleaning (#719) * various cleanup * further cleanup * some cleanup + matches * clean --- include/common_structs.h | 2 +- include/dead.h | 1 + src/163400.c | 72 +++- src/190B20.c | 27 +- src/196AA0.c | 217 ++++++++++- src/1AC760.c | 8 +- src/EA36E0.c | 2 +- src/EA7320.c | 4 +- src/EB1170.c | 8 +- src/EB5130.c | 4 +- src/EB5470.c | 4 +- src/EC71B0.c | 12 +- src/ED8E20.c | 73 +--- src/EE8940.c | 7 +- src/EF2650.c | 6 +- src/EF2680.c | 150 +------- src/battle/action_cmd/07.c | 2 +- src/battle/action_cmd/0A.c | 2 +- src/battle/action_cmd/air_lift.c | 2 +- src/battle/action_cmd/air_raid.c | 2 +- src/battle/action_cmd/bomb.c | 2 +- src/battle/action_cmd/break_free.c | 4 +- ...andFunc1.inc.c => draw_hud_elements.inc.c} | 2 +- src/battle/action_cmd/dizzy_shell.c | 2 +- src/battle/action_cmd/fire_shell.c | 2 +- src/battle/action_cmd/flee.c | 4 +- src/battle/action_cmd/hurricane.c | 4 +- src/battle/action_cmd/mega_shock.c | 4 +- src/battle/action_cmd/smack.c | 2 +- src/battle/action_cmd/spiny_surge.c | 2 +- src/battle/action_cmd/spook.c | 2 +- src/battle/action_cmd/squirt.c | 4 +- src/battle/action_cmd/stop_leech.c | 4 +- src/battle/action_cmd/water_block.c | 4 +- src/battle/action_cmd/whirlwind.c | 4 +- src/pause/pause_main.c | 4 +- src/world/area_flo/flo_14/CCD670.c | 4 +- src/world/common/atomic/Pipe.inc.c | 5 + tools/ignored_funcs.txt | 2 +- ver/us/asm/data/ED9170.data.s | 6 +- ver/us/asm/data/EF58E0.data.s | 2 +- .../data/world/area_mgm/mgm_01/E141D0.data.s | 35 +- .../nonmatchings/163400/mainmenu_draw_rect.s | 144 ------- .../asm/nonmatchings/190B20/func_802666E4.s | 78 ---- .../asm/nonmatchings/196AA0/func_80268AF8.s | 140 ------- .../asm/nonmatchings/196AA0/func_80268C9C.s | 159 -------- .../EC71B0/func_80240344_EC74F4.s | 43 --- .../EE8940/func_80242390_EE8940.s | 16 - .../EF2680/func_80241C90_EF42A0.s | 352 ------------------ ver/us/splat.yaml | 3 +- ver/us/symbol_addrs.txt | 122 +++--- ver/us/undefined_syms.txt | 20 +- 52 files changed, 500 insertions(+), 1286 deletions(-) rename src/battle/action_cmd/common/{UnkActionCommandFunc1.inc.c => draw_hud_elements.inc.c} (94%) delete mode 100644 ver/us/asm/nonmatchings/163400/mainmenu_draw_rect.s delete mode 100644 ver/us/asm/nonmatchings/190B20/func_802666E4.s delete mode 100644 ver/us/asm/nonmatchings/196AA0/func_80268AF8.s delete mode 100644 ver/us/asm/nonmatchings/196AA0/func_80268C9C.s delete mode 100644 ver/us/asm/nonmatchings/EC71B0/func_80240344_EC74F4.s delete mode 100644 ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s delete mode 100644 ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s diff --git a/include/common_structs.h b/include/common_structs.h index 652c22f1a5..eb8beaf98a 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -2070,7 +2070,7 @@ typedef struct SaveDataHeader { /* 0x0030 */ s32 crc1; /* 0x0034 */ s32 crc2; /* 0x0038 */ s32 saveSlot; - /* 0x003C */ s32 saveCount; + /* 0x003C */ u32 saveCount; /* 0x0040 */ s8 ignored[0x40]; } SaveDataHeader; diff --git a/include/dead.h b/include/dead.h index 205c7425c1..fdd35ed759 100644 --- a/include/dead.h +++ b/include/dead.h @@ -111,5 +111,6 @@ #define heap_free dead_heap_free #define entity_upgrade_block_hide_content dead_entity_upgrade_block_hide_content #define func_8003D660 dead_func_80041080 +#define fx_misc_particles dead_fx_misc_particles #endif diff --git a/src/163400.c b/src/163400.c index 1cb74849b7..85d7545280 100644 --- a/src/163400.c +++ b/src/163400.c @@ -1,6 +1,8 @@ #include "common.h" #include "filemenu.h" #include "hud_element.h" +#include "fio.h" +#include "ld_addrs.h" void filemenu_draw_cursor(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening); void filemenu_draw_contents_copy_arrow( @@ -17,6 +19,7 @@ extern MenuPanel D_8024A158; extern MenuPanel D_8024A1D8; extern s32 D_8024BA60; extern s32 D_8024BA98; +extern s32 D_8024C088; s32* D_80249B80[] = { &D_80241ECC }; MenuPanel* filemenu_menus[4] = { &D_8024A098, &D_8024A114, &D_8024A158, &D_8024A1D8 }; @@ -54,7 +57,8 @@ Vp D_80249D60 = { }; f32 D_80249D70[15] = { 7.0f, 12.5f, 13.0f, 14.5f, 14.0f, 13.0f, 11.5f, 9.5f, 7.5f, 5.5f, 3.5f, 2.0f, 1.0f, 0.5f, 0.0f }; s32 D_80249DAC[] = { 0x2C000010, 0x00180120, 0x00C00000, 0x00000000, 0x00000000, 0xFF000000, 0x00000001, 0x40000000, }; -s32 D_80249DCC[] = { &D_8024BA60, 0x18000000, 0x00000120, 0x00C00000, filemenu_draw_contents_copy_arrow, 0x00000000, +s32** D_80249DCC = &D_8024BA60; +s32 D_80249DD0[] = { 0x18000000, 0x00000120, 0x00C00000, filemenu_draw_contents_copy_arrow, 0x00000000, 0x2C000000, 0x00000001, 0x00000000, &D_8024BA98, 0x17000000, 0x00000140, 0x00F00000, filemenu_draw_cursor, 0x00000000, 0xFF000000, 0x00000001, 0x00000000, &D_8024BA98, 0x00000000, 0x00000000, }; @@ -79,7 +83,15 @@ BSS u8 filemenu_8024C110[8]; s32 func_80244BC4(void); -INCLUDE_ASM(s32, "163400", mainmenu_draw_rect); +void mainmenu_draw_rect(s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 uls, s32 ult, s32 dsdx, s32 dtdy) { + if (ulx <= -2688 || uly <= -2688 || lrx <= 0 || lry <= 0) { + return; + } + if (ulx >= 1280 || uly >= 960 || lrx >= 2688 || lry >= 2688) { + return; + } + gSPScisTextureRectangle(gMasterGfxPos++, ulx, uly, lrx, lry, tileDescriptor, uls, ult, dsdx, dtdy); +} void filemenu_set_selected(MenuPanel* menu, s32 col, s32 row) { menu->col = col; @@ -800,7 +812,63 @@ void filemenu_draw_contents_copy_arrow(MenuPanel* menu, s32 baseX, s32 baseY, s3 } } +// some reordering at the end +#ifdef NON_MATCHING +void filemenu_init(s32 arg0) { + MenuPanel* menu; + u32 temp_a2; + s32 i; + + dma_copy(ui_images_ROM_START, ui_images_ROM_END, ui_images_VRAM); + for (i = 0; i < ARRAY_COUNT(filemenu_cursorHudElemID); i++) { + filemenu_cursorHudElemID[i] = hud_element_create(D_80249B80[i]); + hud_element_set_flags(filemenu_cursorHudElemID[i], HUD_ELEMENT_FLAGS_DROP_SHADOW | HUD_ELEMENT_FLAGS_80); + } + + D_8024C088 = filemenu_cursorHudElemID[1]; + if (arg0 == 0) { + *D_80249DCC = NULL; + } + setup_pause_menu_tab(D_80249DAC, 3); + menu = filemenu_menus[0]; + filemenu_8024C098 = 0; + if (arg0 == 0) { + menu->page = 0; + } else { + menu->page = 2; + } + + if (menu->page == 0) { + for (i = 0; i < ARRAY_COUNT(filemenu_menus); i++) { + if (!fio_load_game(i)) { + gSaveSlotHasData[i] = FALSE; + } else { + gSaveSlotMetadata[i] = gCurrentSaveFile.unk_12EC; + gSaveSlotHasData[i] = TRUE; + } + } + + if (menu->page == 0) { + fio_has_valid_backup(); + if (D_800D95E8.saveCount >= 4) { + D_800D95E8.saveCount = 0; + } + gGameStatusPtr->saveSlot = D_800D95E8.saveCount; + } + } + + filemenu_set_selected(menu, (gGameStatusPtr->saveSlot & 1) * 2, gGameStatusPtr->saveSlot >> 1); + + for (i = 0; i < ARRAY_COUNT(filemenu_menus); i++) { + if (filemenu_menus[i]->fpInit != NULL) { + filemenu_menus[i]->fpInit(filemenu_menus[i]); + } + } + update_window_hierarchy(0x17, 0x40); +} +#else INCLUDE_ASM(void, "163400", filemenu_init); +#endif // TODO bad match, look into void filemenu_cleanup(void) { diff --git a/src/190B20.c b/src/190B20.c index 032e3733a1..78e242e406 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -3028,7 +3028,32 @@ void func_80266684(void) { }; } -INCLUDE_ASM(void, "190B20", func_802666E4, Actor* actor, f32 arg1, f32 arg2, f32 arg3, s16 arg4); +void func_802666E4(Actor* actor, f32 x, f32 y, f32 z, s32 damage) { + BattleStatus* battleStatus = &gBattleStatus; + s32 var_t0; + + if (damage < 3) { + var_t0 = 0; + } else if (damage < 5) { + var_t0 = 1; + } else if (damage < 9) { + var_t0 = 2; + } else { + var_t0 = 3; + } + + do { + if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) { + fx_ring_blast(0, x, y, z, 1.0f, 0x18); + } else if (battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) { + func_80251474(actor); + } else if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) { + fx_water_splash(0, x, y, z, 1.0f, 24); + } else { + fx_firework(0, x, y, z, 1.0, var_t0); + } + } while (0); // required to match +} INCLUDE_ASM(void, "190B20", func_802667F0, s32 arg0, Actor* arg1, f32 arg2, f32 arg3, f32 arg4); diff --git a/src/196AA0.c b/src/196AA0.c index 6107231e5e..4448365ca1 100644 --- a/src/196AA0.c +++ b/src/196AA0.c @@ -27,7 +27,52 @@ extern void* actionCommandDmaTable[23]; extern s32 D_8029FBC0; -extern s16 D_8029FC4C; + +void action_command_jump_draw_hud_elements(void); +void action_command_hammer_draw_hud_elements(void); +void action_command_flee_draw_hud_elements(void); +void action_command_break_free_draw_hud_elements(void); +void action_command_whirlwind_draw_hud_elements(void); +void action_command_stop_leech_draw_hud_elements(void); +void action_command_07_draw_hud_elements(void); +void action_command_dizzy_shell_draw_hud_elements(void); +void action_command_fire_shell_draw_hud_elements(void); +void action_command_0A_draw_hud_elements(void); +void action_command_bomb_draw_hud_elements(void); +void action_command_body_slam_draw_hud_elements(void); +void action_command_air_lift_draw_hud_elements(void); +void action_command_air_raid_draw_hud_elements(void); +void action_command_squirt_draw_hud_elements(void); +void action_command_power_shock_draw_hud_elements(void); +void action_command_mega_shock_draw_hud_elements(void); +void action_command_smack_draw_hud_elements(void); +void action_command_spiny_surge_draw_hud_elements(void); +void action_command_hurricane_draw_hud_elements(void); +void action_command_spook_draw_hud_elements(void); +void action_command_water_block_draw_hud_elements(void); +void action_command_tidal_wave_draw_hud_elements(void); +void action_command_jump_free_hud_elements(void); +void action_command_hammer_free_hud_elements(void); +void action_command_flee_free_hud_elements(void); +void action_command_break_free_free_hud_elements(void); +void action_command_whirlwind_free_hud_elements(void); +void action_command_07_free_hud_elements(void); +void action_command_dizzy_shell_free_hud_elements(void); +void action_command_fire_shell_free_hud_elements(void); +void action_command_0A_free_hud_elements(void); +void action_command_bomb_free_hud_elements(void); +void action_command_body_slam_free_hud_elements(void); +void action_command_air_lift_free_hud_elements(void); +void action_command_air_raid_free_hud_elements(void); +void action_command_squirt_free_hud_elements(void); +void action_command_power_shock_free_hud_elements(void); +void action_command_mega_shock_free_hud_elements(void); +void action_command_smack_free_hud_elements(void); +void action_command_spiny_surge_free_hud_elements(void); +void action_command_hurricane_free_hud_elements(void); +void action_command_spook_free_hud_elements(void); +void action_command_water_block_free_hud_elements(void); +void action_command_tidal_wave_free_hud_elements(void); ApiStatus LoadActionCommand(Evt* script, s32 isInitialCall) { s32 cmd = evt_get_variable(script, *script->ptrReadPos); @@ -51,6 +96,7 @@ s32 func_80268224(s32 arg0) { return arg0; } +void func_80268284(s32, s32, s32, s32); INCLUDE_ASM(s32, "196AA0", func_80268284); void func_80268770(s32 arg0, s32 arg1, s32 arg2) { @@ -198,10 +244,165 @@ void func_80268938(void) { } } -void func_80268AF8(void); -INCLUDE_ASM(s32, "196AA0", func_80268AF8); +void func_80268AF8(void) { + switch (gActionCommandStatus.actionCommandID) { + case ACTION_COMMAND_NONE: + break; + case ACTION_COMMAND_JUMP: + action_command_jump_draw_hud_elements(); + break; + case ACTION_COMMAND_SMASH: + action_command_hammer_draw_hud_elements(); + break; + case ACTION_COMMAND_FLEE: + action_command_flee_draw_hud_elements(); + break; + case ACTION_COMMAND_BREAK_FREE: + action_command_break_free_draw_hud_elements(); + break; + case ACTION_COMMAND_WHIRLWIND: + action_command_whirlwind_draw_hud_elements(); + break; + case ACTION_COMMAND_STOP_LEECH: + action_command_stop_leech_draw_hud_elements(); + break; + case ACTION_COMMAND_07: + action_command_07_draw_hud_elements(); + break; + case ACTION_COMMAND_DIZZY_SHELL: + action_command_dizzy_shell_draw_hud_elements(); + break; + case ACTION_COMMAND_FIRE_SHELL: + action_command_fire_shell_draw_hud_elements(); + break; + case ACTION_COMMAND_0A: + action_command_0A_draw_hud_elements(); + break; + case ACTION_COMMAND_BOMB: + action_command_bomb_draw_hud_elements(); + break; + case ACTION_COMMAND_BODY_SLAM: + action_command_body_slam_draw_hud_elements(); + break; + case ACTION_COMMAND_AIR_LIFT: + action_command_air_lift_draw_hud_elements(); + break; + case ACTION_COMMAND_AIR_RAID: + action_command_air_raid_draw_hud_elements(); + break; + case ACTION_COMMAND_SQUIRT: + action_command_squirt_draw_hud_elements(); + break; + case ACTION_COMMAND_POWER_SHOCK: + action_command_power_shock_draw_hud_elements(); + break; + case ACTION_COMMAND_MEGA_SHOCK: + action_command_mega_shock_draw_hud_elements(); + break; + case ACTION_COMMAND_SMACK: + action_command_smack_draw_hud_elements(); + break; + case ACTION_COMMAND_SPINY_SURGE: + action_command_spiny_surge_draw_hud_elements(); + break; + case ACTION_COMMAND_HURRICANE: + action_command_hurricane_draw_hud_elements(); + break; + case ACTION_COMMAND_SPOOK: + action_command_spook_draw_hud_elements(); + break; + case ACTION_COMMAND_WATER_BLOCK: + action_command_water_block_draw_hud_elements(); + break; + case ACTION_COMMAND_TIDAL_WAVE: + action_command_tidal_wave_draw_hud_elements(); + } +} -INCLUDE_ASM(s32, "196AA0", func_80268C9C); +void func_80268C9C(void) { + ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; + + switch (actionCommandStatus->actionCommandID) { + case ACTION_COMMAND_NONE: + break; + case ACTION_COMMAND_JUMP: + action_command_jump_free_hud_elements(); + break; + case ACTION_COMMAND_SMASH: + action_command_hammer_free_hud_elements(); + break; + case ACTION_COMMAND_FLEE: + action_command_flee_free_hud_elements(); + break; + case ACTION_COMMAND_BREAK_FREE: + action_command_break_free_free_hud_elements(); + break; + case ACTION_COMMAND_WHIRLWIND: + action_command_whirlwind_free_hud_elements(); + break; + case ACTION_COMMAND_STOP_LEECH: + action_command_jump_draw_hud_elements(); + break; + case ACTION_COMMAND_07: + action_command_07_free_hud_elements(); + break; + case ACTION_COMMAND_DIZZY_SHELL: + action_command_dizzy_shell_free_hud_elements(); + break; + case ACTION_COMMAND_FIRE_SHELL: + action_command_fire_shell_free_hud_elements(); + break; + case ACTION_COMMAND_0A: + action_command_0A_free_hud_elements(); + break; + case ACTION_COMMAND_BOMB: + action_command_bomb_free_hud_elements(); + break; + case ACTION_COMMAND_BODY_SLAM: + action_command_body_slam_free_hud_elements(); + break; + case ACTION_COMMAND_AIR_LIFT: + action_command_air_lift_free_hud_elements(); + break; + case ACTION_COMMAND_AIR_RAID: + action_command_air_raid_free_hud_elements(); + break; + case ACTION_COMMAND_SQUIRT: + action_command_squirt_free_hud_elements(); + break; + case ACTION_COMMAND_POWER_SHOCK: + action_command_power_shock_free_hud_elements(); + break; + case ACTION_COMMAND_MEGA_SHOCK: + action_command_mega_shock_free_hud_elements(); + break; + case ACTION_COMMAND_SMACK: + action_command_smack_free_hud_elements(); + break; + case ACTION_COMMAND_SPINY_SURGE: + action_command_spiny_surge_free_hud_elements(); + break; + case ACTION_COMMAND_HURRICANE: + action_command_hurricane_free_hud_elements(); + break; + case ACTION_COMMAND_SPOOK: + action_command_spook_free_hud_elements(); + break; + case ACTION_COMMAND_WATER_BLOCK: + action_command_water_block_free_hud_elements(); + break; + case ACTION_COMMAND_TIDAL_WAVE: + action_command_tidal_wave_free_hud_elements(); + break; + } + + actionCommandStatus->actionCommandID = ACTION_COMMAND_NONE; + gBattleStatus.flags1 &= ~BS_FLAGS1_2000; + gBattleStatus.flags1 &= ~BS_FLAGS1_8000; + gBattleStatus.flags1 &= ~BS_FLAGS1_4000; + close_action_command_instruction_popup(); + btl_set_popup_duration(0); +} void func_80268E88(void) { ActionCommandStatus* actionCmdStatus = &gActionCommandStatus; @@ -223,7 +424,7 @@ s32 check_block_input(s32 buttonMask) { battleStatus->blockResult = 0; // Fail - if (battleStatus->unk_83 == -1 && (battleStatus->flags1 & 0x2000000)) { + if (battleStatus->unk_83 == -1 && (battleStatus->flags1 & BS_FLAGS1_2000000)) { battleStatus->blockResult = 1; return TRUE; } @@ -243,7 +444,7 @@ s32 check_block_input(s32 buttonMask) { blockWindow = 3; mashWindow = 10; - if (!(gBattleStatus.flags1 & 0x80000) && is_ability_active(ABILITY_DODGE_MASTER)) { + if (!(gBattleStatus.flags1 & BS_FLAGS1_80000) && is_ability_active(ABILITY_DODGE_MASTER)) { blockWindow = 5; } @@ -373,7 +574,7 @@ ApiStatus GetActionCommandMode(Evt* script, s32 isInitialCall) { } ApiStatus func_80269344(Evt* script, s32 isInitialCall) { - D_8029FC4C = evt_get_variable(script, *script->ptrReadPos); + gActionCommandStatus.unk_6C = evt_get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -394,7 +595,7 @@ ApiStatus SetCommandAutoSuccess(Evt* script, s32 isInitialCall) { } ApiStatus func_802693F0(Evt* script, s32 isInitialCall) { - gBattleStatus.flags1 &= ~0x4000; + gBattleStatus.flags1 &= ~BS_FLAGS1_4000; return ApiStatus_DONE2; } diff --git a/src/1AC760.c b/src/1AC760.c index 9304b074f4..6cb72199c0 100644 --- a/src/1AC760.c +++ b/src/1AC760.c @@ -798,11 +798,12 @@ s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) { ActorMovement* state = &partner->state; s32 flagCheck; s32 temp_a1; + s16 temp_v1; - damageAmount = (s16)damageAmount; battleStatus->currentAttackDamage = damageAmount; partner->currentHP = 127; - temp_a1 = (s16)(partner->hpChangeCounter + damageAmount); + temp_v1 = partner->hpChangeCounter + damageAmount; + temp_a1 = temp_v1; partner->hpChangeCounter += damageAmount; partner->hpChangeCounter -= temp_a1; partner->damageCounter += temp_a1; @@ -829,8 +830,7 @@ s32 dispatch_damage_event_partner(s32 damageAmount, s32 event, s32 stopMotion) { } if (battleStatus->lastAttackDamage > 0) { - BattleStatus* battleStatus2 = &gBattleStatus; // TODO macro for setting flags of battleStatus - battleStatus2->flags1 |= 0x20; + gBattleStatus.flags1 |= 0x20; inflict_status(partner, 0xD, battleStatus->lastAttackDamage); } diff --git a/src/EA36E0.c b/src/EA36E0.c index bf8dea36ab..8eb5e4e4e0 100644 --- a/src/EA36E0.c +++ b/src/EA36E0.c @@ -28,7 +28,7 @@ ApiStatus N(GetActingPartner)(Evt* script, s32 isInitialCall) { // Normally this would be #include "world/common/UnkFunc47.inc.c" // Due to sqrtf being an inline/instrinsic func, we can't use dead.h #ifdef NON_MATCHING -ApiStatus func_80242EC4_EA37C4(Evt* script, s32 isInitialCall) { +ApiStatus N(UnkFunc47(Evt* script, s32 isInitialCall) { f32 var1 = script->varTable[0] - gPlayerStatus.position.x; f32 var2 = script->varTable[2] - gPlayerStatus.position.y; f32 var3 = 0.0f - gPlayerStatus.position.z; diff --git a/src/EA7320.c b/src/EA7320.c index 7541ebbd45..4876d8da64 100644 --- a/src/EA7320.c +++ b/src/EA7320.c @@ -8,6 +8,8 @@ #include "world/common/UnsetCamera0Flag1000.inc.c" ApiStatus func_80240388_EA7358(Evt* script, s32 isInitialCall) { - evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall); + Bytecode* args = script->ptrReadPos; + + evt_set_variable(script, *args++, gCollisionStatus.currentFloor); return ApiStatus_DONE2; } diff --git a/src/EB1170.c b/src/EB1170.c index b0cf597268..f2f449395b 100644 --- a/src/EB1170.c +++ b/src/EB1170.c @@ -20,8 +20,8 @@ extern s32 D_800B8DEC; #include "world/common/AddPlayerHandsOffset.inc.c" -// LW %LO issue. -#ifdef NON_EQUIVALENT +// Needs data migrated +#ifdef NON_MATCHING ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -37,7 +37,7 @@ ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) { } #else INCLUDE_ASM(s32, "EB1170", func_80240654_EB14B4); -#endif // NON_EQUIVALENT +#endif ApiStatus func_802406A8_EB1508(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -77,6 +77,6 @@ ApiStatus func_80240A68_EB18C8(Evt* script, s32 isInitialCall) { ApiStatus func_80240A8C_EB18EC(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - evt_set_variable(script, *args++, dead_gCollisionStatus.pushingAgainstWall); + evt_set_variable(script, *args++, gCollisionStatus.currentFloor); return ApiStatus_DONE2; } diff --git a/src/EB5130.c b/src/EB5130.c index 5c8950e24e..21c8017dee 100644 --- a/src/EB5130.c +++ b/src/EB5130.c @@ -6,6 +6,8 @@ #include "world/common/atomic/TexturePan.inc.c" ApiStatus func_8024030C_EB543C(Evt* script, s32 isInitialCall) { - evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall); + Bytecode* args = script->ptrReadPos; + + evt_set_variable(script, *args++, gCollisionStatus.currentFloor); return ApiStatus_DONE2; } diff --git a/src/EB5470.c b/src/EB5470.c index 091e01c79b..75469557c2 100644 --- a/src/EB5470.c +++ b/src/EB5470.c @@ -4,7 +4,9 @@ #define NAMESPACE EB5470 ApiStatus func_80240340_EB5470(Evt* script, s32 isInitialCall) { - evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall); + Bytecode* args = script->ptrReadPos; + + evt_set_variable(script, *args++, gCollisionStatus.currentFloor); return ApiStatus_DONE2; } diff --git a/src/EC71B0.c b/src/EC71B0.c index af86040de9..d5100833de 100644 --- a/src/EC71B0.c +++ b/src/EC71B0.c @@ -9,4 +9,14 @@ #include "world/common/SpawnSunEffect.inc.c" -INCLUDE_ASM(s32, "EC71B0", func_80240344_EC74F4); +ApiStatus func_80240344_EC74F4(Evt* script, s32 isInitialCall) { + EffectInstance* effect = fx_misc_particles(3, -272.0f, 80.0f, 20.0f, 200.0f, 120.0f, 4.0f, 8, 0); + + ((MiscParticlesFXData*)effect->data)->unk_38 = 240; + ((MiscParticlesFXData*)effect->data)->unk_3C = 240; + ((MiscParticlesFXData*)effect->data)->unk_40 = 240; + ((MiscParticlesFXData*)effect->data)->unk_48 = 230; + ((MiscParticlesFXData*)effect->data)->unk_4C = 230; + ((MiscParticlesFXData*)effect->data)->unk_50 = 240; + return ApiStatus_DONE2; +} diff --git a/src/ED8E20.c b/src/ED8E20.c index 1131d03dcc..3fdd52d82a 100644 --- a/src/ED8E20.c +++ b/src/ED8E20.c @@ -5,74 +5,13 @@ #define NAMESPACE ED8E20 -ApiStatus N(DeadPipe_SetAnimFlag)(Evt* script, s32 isInitialCall) { - gPlayerStatusPtr->animFlags |= PLAYER_STATUS_ANIM_FLAGS_100000; - return ApiStatus_DONE2; -} - -// Variation of Pipe_GetCurrentFloor that is non-equivalent -ApiStatus N(DeadPipe_GetCurrentFloor)(Evt* script, s32 isInitialCall) { - script->varTable[0] = dead_gCollisionStatus.pushingAgainstWall; - return ApiStatus_DONE2; -} - -// Variation of Pipe_AwaitDownInput that is non-equivalent -ApiStatus N(DeadPipe_AwaitDownInput)(Evt* script, s32 isInitialCall) { - CollisionStatus* collisionStatus = &gCollisionStatus; - s32 stickX, stickY; - - if (collisionStatus->pushingAgainstWall != script->varTable[11]) { - script->varTable[0] = FALSE; - return ApiStatus_DONE2; - } - - stickX = abs(gGameStatusPtr->stickX); - stickY = gGameStatusPtr->stickY; - - if (stickX != 0 || stickY != 0) { - if (atan2(0.0f, 0.0f, stickX, stickY) < 60.0f) { - script->varTable[0] = TRUE; - return ApiStatus_DONE2; - } - } - - return ApiStatus_BLOCK; -} - -// Variation of Pipe_GetEntryPos with a debug print at the end -ApiStatus N(DeadPipe_GetEntryPos)(Evt* script, s32 isInitialCall) { - MapConfig* mapConfig = get_current_map_header(); - s32 index = evt_get_variable(script, EVT_VAR(0)); - - evt_set_variable(script, EVT_VAR(1), ((Vec4f*)*mapConfig->entryList)[index].x); - evt_set_variable(script, EVT_VAR(2), ((Vec4f*)*mapConfig->entryList)[index].y); - evt_set_variable(script, EVT_VAR(3), ((Vec4f*)*mapConfig->entryList)[index].z); - evt_set_variable(script, EVT_VAR(4), ((Vec4f*)*mapConfig->entryList)[index].yaw); - osSyncPrintf("[%d] dokan get pos (no=%d) pos=%d, %d, %d, dir=%d\n\0\0\0flo_23\0\0flo_12\0\0flo_11", dead_gGameStatusPtr->frameCounter, script->varTable[0], script->varTable[1], script->varTable[2], script->varTable[3], script->varTable[4]); - return ApiStatus_DONE2; -} - -ApiStatus N(DeadPipe_GetCameraYaw)(Evt* script, s32 isInitialCall) { - script->varTable[0] = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); - return ApiStatus_DONE2; -} - -ApiStatus N(DeadPipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialStatus) { - PlayerStatus* playerStatus = &gPlayerStatus; - f32 r = evt_get_float_variable(script, *script->ptrReadPos); - f32 x = playerStatus->position.x; - f32 y = playerStatus->position.y; - f32 z = playerStatus->position.z; - - add_vec2D_polar(&x, &z, r, playerStatus->targetYaw); - evt_set_float_variable(script, EVT_VAR(0), x); - evt_set_float_variable(script, EVT_VAR(1), y); - evt_set_float_variable(script, EVT_VAR(2), z); - - return ApiStatus_DONE2; -} +#include "world/common/atomic/Pipe.inc.c" ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) { - dead_fx_sun(0, 0, 0, 0, 0, 0); + fx_sun(0, 0, 0, 0, 0, 0); return ApiStatus_DONE2; } + +const static char* exit_string1 = "flo_23"; +const static char* exit_string2 = "flo_12"; +const static char* exit_string3 = "flo_11"; diff --git a/src/EE8940.c b/src/EE8940.c index f99937252e..b75a78dac8 100644 --- a/src/EE8940.c +++ b/src/EE8940.c @@ -3,4 +3,9 @@ #define NAMESPACE EE8940 -INCLUDE_ASM(s32, "EE8940", func_80242390_EE8940); +ApiStatus func_80242390_EE8940(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + evt_set_variable(script, *args++, gCollisionStatus.floorBelow); + return ApiStatus_DONE2; +} diff --git a/src/EF2650.c b/src/EF2650.c index f3d250283c..0a26c50b1a 100644 --- a/src/EF2650.c +++ b/src/EF2650.c @@ -3,9 +3,9 @@ #define NAMESPACE EF2650 -extern s16 D_80169B16; - ApiStatus func_80240040_EF2650(Evt* script, s32 isInitialCall) { - evt_set_variable(script, *script->ptrReadPos, D_80169B16); + Bytecode* args = script->ptrReadPos; + + evt_set_variable(script, *args++, gCollisionStatus.floorBelow); return ApiStatus_DONE2; } diff --git a/src/EF2680.c b/src/EF2680.c index 95e3169612..70a49723b9 100644 --- a/src/EF2680.c +++ b/src/EF2680.c @@ -1,153 +1,11 @@ #include "dead.h" #include "common.h" -// Copy of flo_25 (CF2C10.c) +// Copy of flo_13 or _17 (CC3850 or CD7350) #define NAMESPACE EF2680 -#include "world/common/enemy/FlyingAI.inc.c" - -s32 func_80241594_EF3BA4(void) { - s32 i; - - for (i = 50; i < 54; i++) { - if (get_enemy(i)->varTable[10] == 0) { - return i; - } - } - - return -1; -} - -void func_802415DC_EF3BEC(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - f32 temp_f20; - f32 temp_f22; - f32 temp_f24; - f32 var1 = enemy->varTable[4]; - f32 var2 = enemy->varTable[3]; - f32 var3; - - temp_f22 = var1 / 100.0; - temp_f24 = var2 / 100.0; - if (npc->duration > 0) { - npc->duration--; - } - var3 = enemy->varTable[1]; - temp_f20 = var3 / 100.0; - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->pos.y = y + temp_f24 + (sin_deg(enemy->varTable[2]) * temp_f20); - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - - if (aiSettings->playerSearchInterval >= 0) { - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = aiSettings->playerSearchInterval; - if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->moveToPos.y = y + temp_f24; - script->functionTemp[0] = 12; - return; - } - } - script->functionTemp[1]--; - } - - if (is_point_within_region(enemy->territory->wander.wanderShape, enemy->territory->wander.point.x, - enemy->territory->wander.point.z, npc->pos.x, npc->pos.z, enemy->territory->wander.wanderSizeX, - enemy->territory->wander.wanderSizeZ) != 0) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } - - if (npc->turnAroundYawAdjustment == 0) { - if (npc->duration > 0) { - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (enemy->varTable[0] & 1) { - x = npc->pos.x; - y = temp_f22; - z = npc->pos.z; - w = 1000.0f; - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - y += temp_f24; - w = y - temp_f22; - if (w > 2.0) { - temp_f22 += 2.0; - } else if (w < -2.0) { - temp_f22 -= 2.0; - } else { - temp_f22 = y; - } - enemy->varTable[4] = (temp_f22 * 100.0); - } - if (npc->duration > 0) { - return; - } - } - script->functionTemp[0] = 2; - script->functionTemp[1] = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_AI_2C <= 0) || (aiSettings->moveTime <= 0) || (script->functionTemp[1] == 0)) { - script->functionTemp[0] = 0; - } - } -} - -void func_80241A40_EF4050(Evt* script, NpcAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, y, z, w; - s32 var; - f32 var1 = enemy->varTable[3]; - f32 var2; - f32 temp_f20; - f32 temp_f22; - - temp_f22 = var1 / 100.0; - if (npc->duration > 0) { - npc->duration--; - } - var2 = enemy->varTable[1]; - temp_f20 = var2 / 100.0; - - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - w = 1000.0f; - - npc_raycast_down_sides(npc->collisionChannel, &x, &y, &z, &w); - npc->pos.y = y + temp_f22 + (sin_deg(enemy->varTable[2]) * temp_f20); - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 0xC); - if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 1)) { - fx_emote(EMOTE_EXCLAMATION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - script->functionTemp[0] = 12; - return; - } - - if ((npc->turnAroundYawAdjustment == 0) && (npc->duration <= 0)) { - script->functionTemp[1]--; - if (script->functionTemp[1] > 0) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - npc->duration = (rand_int(1000) % 11) + 5; - return; - } - script->functionTemp[0] = 0; - } -} - -INCLUDE_ASM(s32, "EF2680", func_80241C90_EF42A0); - +#define AI_LAKITU_FIRST_SPINY_ID 50 +#define AI_LAKITU_LAST_SPINY_ID 53 +#include "world/common/enemy/LakituAI.inc.c" #include "world/common/enemy/SpinyAI.inc.c" diff --git a/src/battle/action_cmd/07.c b/src/battle/action_cmd/07.c index a560234149..d912591b96 100644 --- a/src/battle/action_cmd/07.c +++ b/src/battle/action_cmd/07.c @@ -183,7 +183,7 @@ void func_802A9228_425D78(void) { } } -void func_802A94D8_426028(void) { +void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 hudX; s32 hudY; diff --git a/src/battle/action_cmd/0A.c b/src/battle/action_cmd/0A.c index 8291f6575c..9a26245568 100644 --- a/src/battle/action_cmd/0A.c +++ b/src/battle/action_cmd/0A.c @@ -160,6 +160,6 @@ void func_802A928C_42763C(void) { } } -#include "common/UnkActionCommandFunc1.inc.c" +#include "common/draw_hud_elements.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 90e789fd5c..7ed752ff93 100644 --- a/src/battle/action_cmd/air_lift.c +++ b/src/battle/action_cmd/air_lift.c @@ -236,7 +236,7 @@ void func_802A9278_428CE8(void) { } } -void func_802A96EC_42915C(void) { +void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 hudX; s32 hudY; diff --git a/src/battle/action_cmd/air_raid.c b/src/battle/action_cmd/air_raid.c index 2614bcda6e..ff63d8f0de 100644 --- a/src/battle/action_cmd/air_raid.c +++ b/src/battle/action_cmd/air_raid.c @@ -229,6 +229,6 @@ void func_802A9294_4295B4(void) { } } -#include "common/UnkActionCommandFunc1.inc.c" +#include "common/draw_hud_elements.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 defa46da20..3ae9a16cd4 100644 --- a/src/battle/action_cmd/bomb.c +++ b/src/battle/action_cmd/bomb.c @@ -191,6 +191,6 @@ void func_802A928C_427CFC(void) { } } -#include "common/UnkActionCommandFunc1.inc.c" +#include "common/draw_hud_elements.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/break_free.c b/src/battle/action_cmd/break_free.c index 2db9060b66..8aaa0070ad 100644 --- a/src/battle/action_cmd/break_free.c +++ b/src/battle/action_cmd/break_free.c @@ -222,7 +222,7 @@ void func_802A92DC_4236CC(void) { } } -void func_802A96B8_423AA8(void) { +void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32* hudElements = actionCommandStatus->hudElements; s32 hudX; @@ -254,7 +254,7 @@ void func_802A96B8_423AA8(void) { hud_element_draw_clipped(hudElements[3]); } -void func_802A97FC_423BEC(void) { +void N(free_hud_elements)(void) { hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); hud_element_free(gActionCommandStatus.hudElements[2]); diff --git a/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c b/src/battle/action_cmd/common/draw_hud_elements.inc.c similarity index 94% rename from src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c rename to src/battle/action_cmd/common/draw_hud_elements.inc.c index 27f89dbb08..7eed6e9e75 100644 --- a/src/battle/action_cmd/common/UnkActionCommandFunc1.inc.c +++ b/src/battle/action_cmd/common/draw_hud_elements.inc.c @@ -1,6 +1,6 @@ #include "common.h" -void N(UnkActionCommandFunc1)(void) { +void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 hudX; diff --git a/src/battle/action_cmd/dizzy_shell.c b/src/battle/action_cmd/dizzy_shell.c index 2177e55f59..f5a53c443b 100644 --- a/src/battle/action_cmd/dizzy_shell.c +++ b/src/battle/action_cmd/dizzy_shell.c @@ -198,6 +198,6 @@ void func_802A928C_4263FC(void) { } } -#include "common/UnkActionCommandFunc1.inc.c" +#include "common/draw_hud_elements.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 ac1803142b..149f6d5605 100644 --- a/src/battle/action_cmd/fire_shell.c +++ b/src/battle/action_cmd/fire_shell.c @@ -215,6 +215,6 @@ void func_802A9294_426C64(void) { } } -#include "common/UnkActionCommandFunc1.inc.c" +#include "common/draw_hud_elements.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/flee.c b/src/battle/action_cmd/flee.c index f3802b3886..9dd33ebb50 100644 --- a/src/battle/action_cmd/flee.c +++ b/src/battle/action_cmd/flee.c @@ -203,7 +203,7 @@ void func_802A9378_422E48(void) { } } -void func_802A96F4_4231C4(void) { +void N(draw_hud_elements)(void) { s32 y; s32 x; s32 temp_a1; @@ -243,7 +243,7 @@ void func_802A96F4_4231C4(void) { hud_element_draw_clipped(actionCommandStatus->hudElements[4]); } -void func_802A9894_423364(void) { +void N(free_hud_elements)(void) { hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); hud_element_free(gActionCommandStatus.hudElements[2]); diff --git a/src/battle/action_cmd/hurricane.c b/src/battle/action_cmd/hurricane.c index 99c6564047..dae2565a3d 100644 --- a/src/battle/action_cmd/hurricane.c +++ b/src/battle/action_cmd/hurricane.c @@ -314,7 +314,7 @@ void func_802A92A0_42F980(void) { } } -void func_802A97AC_42FE8C(void) { +void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 hudY; s32 hudX; @@ -336,7 +336,7 @@ void func_802A97AC_42FE8C(void) { hud_element_draw_clipped(actionCommandStatus->hudElements[4]); } -void func_802A9894_42FF74(void) { +void N(free_hud_elements)(void) { hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); hud_element_free(gActionCommandStatus.hudElements[2]); diff --git a/src/battle/action_cmd/mega_shock.c b/src/battle/action_cmd/mega_shock.c index 2a63a75069..24ef2fccd9 100644 --- a/src/battle/action_cmd/mega_shock.c +++ b/src/battle/action_cmd/mega_shock.c @@ -321,7 +321,7 @@ void func_802A92A0_42DCB0(void) { } } -void func_802A97F8_42E208(void) { +void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 hudElement; @@ -344,7 +344,7 @@ void func_802A97F8_42E208(void) { hud_element_draw_clipped(actionCommandStatus->hudElements[4]); } -void func_802A98E0_42E2F0(void) { +void N(free_hud_elements)(void) { hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); hud_element_free(gActionCommandStatus.hudElements[2]); diff --git a/src/battle/action_cmd/smack.c b/src/battle/action_cmd/smack.c index dd065f81a4..4926c5735a 100644 --- a/src/battle/action_cmd/smack.c +++ b/src/battle/action_cmd/smack.c @@ -284,6 +284,6 @@ void func_802A9298_42E638(void) { } } -#include "common/UnkActionCommandFunc1.inc.c" +#include "common/draw_hud_elements.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 781c54fdd9..f5c94b83f3 100644 --- a/src/battle/action_cmd/spiny_surge.c +++ b/src/battle/action_cmd/spiny_surge.c @@ -236,6 +236,6 @@ void func_802A9254_42F074(void) { } } -#include "common/UnkActionCommandFunc1.inc.c" +#include "common/draw_hud_elements.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 54a88dc5ae..707a659ecf 100644 --- a/src/battle/action_cmd/spook.c +++ b/src/battle/action_cmd/spook.c @@ -228,6 +228,6 @@ void func_802A9298_4302B8(void) { } } -#include "common/UnkActionCommandFunc1.inc.c" +#include "common/draw_hud_elements.inc.c" #include "common/free_hud_elements.inc.c" diff --git a/src/battle/action_cmd/squirt.c b/src/battle/action_cmd/squirt.c index 2130e8f6c2..9395848cbc 100644 --- a/src/battle/action_cmd/squirt.c +++ b/src/battle/action_cmd/squirt.c @@ -204,7 +204,7 @@ void func_802A9208_429F28(void) { } } -void func_802A9634_42A354(void) { +void N(draw_hud_elements)(void) { s32 x, y; s32 id; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; @@ -220,7 +220,7 @@ void func_802A9634_42A354(void) { } } -void func_802A9720_42A440(void) { +void N(free_hud_elements)(void) { sfx_stop_sound(0x80000041); hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); diff --git a/src/battle/action_cmd/stop_leech.c b/src/battle/action_cmd/stop_leech.c index d7747fd06d..891cf2fdbb 100644 --- a/src/battle/action_cmd/stop_leech.c +++ b/src/battle/action_cmd/stop_leech.c @@ -146,7 +146,7 @@ void func_802A91F8_425788(void) { } } -void func_802A94A4_425A34(void) { +void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; s32 x, y; s32 hudElement; @@ -161,7 +161,7 @@ void func_802A94A4_425A34(void) { func_80268798(x, y, actionCommandStatus->barFillLevel / 100, 2); } -void func_802A9544_425AD4(void) { +void N(free_hud_elements)(void) { hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); } diff --git a/src/battle/action_cmd/water_block.c b/src/battle/action_cmd/water_block.c index 475858491a..0bad17b944 100644 --- a/src/battle/action_cmd/water_block.c +++ b/src/battle/action_cmd/water_block.c @@ -613,7 +613,7 @@ void func_802A948C_42A97C(void) { } } -void func_802AA014_42B504(void) { +void N(draw_hud_elements)(void) { s32 hudElement; ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; @@ -638,7 +638,7 @@ void func_802AA014_42B504(void) { hud_element_draw_clipped(actionCommandStatus->hudElements[12]); } -void func_802AA0D8_42B5C8(void) { +void N(free_hud_elements)(void) { hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); hud_element_free(gActionCommandStatus.hudElements[2]); diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c index 7a99df8421..0f5b80f7fd 100644 --- a/src/battle/action_cmd/whirlwind.c +++ b/src/battle/action_cmd/whirlwind.c @@ -331,7 +331,7 @@ void func_802A92F0_423F60(void) { } } -void func_802A9744_4243B4(void) { +void N(draw_hud_elements)(void) { ActionCommandStatus* actionCommandStatus = &gActionCommandStatus; BattleStatus* battleStatus = &gBattleStatus; s32 x, y; @@ -359,7 +359,7 @@ void func_802A9744_4243B4(void) { hud_element_draw_clipped(id); } -void func_802A9898_424508(void) { +void N(free_hud_elements)(void) { hud_element_free(gActionCommandStatus.hudElements[0]); hud_element_free(gActionCommandStatus.hudElements[1]); hud_element_free(gActionCommandStatus.hudElements[2]); diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index 4e37d110ea..78478b6ea5 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -572,13 +572,13 @@ void pause_tutorial_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 wid } void pause_init(void) { - s32 i; s32 posX; s32 x; Window* pauseWindows; MenuPanel** menuPanels; + s32 i; - dma_copy(_131340_ROM_START, _131340_ROM_END, _131340_VRAM); + dma_copy(ui_images_ROM_START, ui_images_ROM_END, ui_images_VRAM); for (i = 0; i < ARRAY_COUNT(gPauseIconScripts); i++) { gPauseCommonIconIDs[i] = hud_element_create(gPauseIconScripts[i]); diff --git a/src/world/area_flo/flo_14/CCD670.c b/src/world/area_flo/flo_14/CCD670.c index 724a50ccb0..d308dd4189 100644 --- a/src/world/area_flo/flo_14/CCD670.c +++ b/src/world/area_flo/flo_14/CCD670.c @@ -1,8 +1,8 @@ #include "flo_14.h" ApiStatus N(func_80242360_CCD670)(Evt* script, s32 isInitialCall) { - CollisionStatus* collisionStatus = &gCollisionStatus; + Bytecode* args = script->ptrReadPos; - evt_set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); + evt_set_variable(script, *args++, gCollisionStatus.floorBelow); return ApiStatus_DONE2; } diff --git a/src/world/common/atomic/Pipe.inc.c b/src/world/common/atomic/Pipe.inc.c index 16d0140aa0..3c91892689 100644 --- a/src/world/common/atomic/Pipe.inc.c +++ b/src/world/common/atomic/Pipe.inc.c @@ -41,6 +41,11 @@ ApiStatus N(Pipe_GetEntryPos)(Evt* script, s32 isInitialCall) { evt_set_variable(script, EVT_VAR(2), ((Vec4f*)*mapConfig->entryList)[index].y); evt_set_variable(script, EVT_VAR(3), ((Vec4f*)*mapConfig->entryList)[index].z); evt_set_variable(script, EVT_VAR(4), ((Vec4f*)*mapConfig->entryList)[index].yaw); + #ifdef _DEAD_H_ + osSyncPrintf("[%d] dokan get pos (no=%d) pos=%d, %d, %d, dir=%d\n", + gGameStatusPtr->frameCounter, script->varTable[0], script->varTable[1], script->varTable[2], + script->varTable[3], script->varTable[4]); + #endif return ApiStatus_DONE2; } diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index 1770c0795d..cc76cea4f1 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -65,7 +65,7 @@ dead_decrement_status_menu_disabled = 0x800F16F4; dead_get_model_list_index_from_tree_index = 0x80125270; dead_get_model_from_list_index = 0x80124F44; dead_guTranslateF = 0x8006CAC0; -func_800775D0 = 0x800775D0; +dead_fx_misc_particles = 0x800775D0; dead_entity_upgrade_block_hide_content = 0x802F3B00; dead_create_popup_menu = 0x800FCD0C; dead_hide_popup_menu = 0x800F9260; diff --git a/ver/us/asm/data/ED9170.data.s b/ver/us/asm/data/ED9170.data.s index 19f5b91d72..99f26a814d 100644 --- a/ver/us/asm/data/ED9170.data.s +++ b/ver/us/asm/data/ED9170.data.s @@ -9,13 +9,13 @@ dlabel D_80240410_ED9230 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024072C_ED954C -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000002, D_802DFEB8, 0x00000100, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000900, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_DeadPipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000002, D_802DFEB8, 0x00000100, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, ED8E20_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000900, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E70_ED9C90 -.word 0x00000043, 0x00000001, ED8E20_DeadPipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240F4C_ED9D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, ED8E20_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240F4C_ED9D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F4C_ED9D6C -.word 0x00000043, 0x00000001, ED8E20_DeadPipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000001, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetCameraYaw, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, ED8E20_DeadPipe_SetAnimFlag, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_DeadPipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_DeadPipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, ED8E20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000001, 0x00000043, 0x00000001, ED8E20_Pipe_GetCameraYaw, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DF380, 0x00200000, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DFABC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, ED8E20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, ED8E20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DEF5C, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x00000163, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000002, D_802DFEB8, 0x00000800, 0x00000043, 0x00000007, 0x802DFB40, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, 0x802DE3C0, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, ED8E20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024145C_EDA27C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802431A8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EF58E0.data.s b/ver/us/asm/data/EF58E0.data.s index b57e7e492e..76861bd613 100644 --- a/ver/us/asm/data/EF58E0.data.s +++ b/ver/us/asm/data/EF58E0.data.s @@ -39,7 +39,7 @@ dlabel D_802444D4_EF6AE4 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42700000, 0x42480000, 0x00000003, 0x40600000, 0x0000003C, 0x0000000A, 0x42A00000, 0x428C0000, 0x00000001 dlabel D_80244504_EF6B14 -.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, func_80241C90_EF42A0, D_802444D4_EF6AE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, EF2680_LakituAI_Main, D_802444D4_EF6AE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244574_EF6B84 .word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_80244504_EF6B14, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 diff --git a/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s b/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s index 0c4b63c78e..e2e4743808 100644 --- a/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s +++ b/ver/us/asm/data/world/area_mgm/mgm_01/E141D0.data.s @@ -30,7 +30,40 @@ dlabel mgm_01_InitialConfigurations .word 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000001, 0x00000003, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000000 dlabel D_80241C4C_E143AC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000004, 0xFE363C8C, 0x00000005, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, mgm_01_GetPanelInfo, 0xFE363C8A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, mgm_01_InitPanelEmergeFromBlock, 0xFE363C8A, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000003, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mgm_01_InitPanelHoldAboveBlock, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000005, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000002, mgm_01_InitPanelMoveToTally, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000007, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000002, mgm_01_EndPanelAnimation, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000009, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, mgm_01_UpdatePanelEmergeFromBlock, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000004, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000002, mgm_01_UpdatetPanelHoldAboveBlock, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000006, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000002, mgm_01_UpdatePanelMoveToTally, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000008, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, mgm_01_GetPanelPos, 0xFE363C8A, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C88, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xFE363C89, 0xFE363C89, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000063, 0x00000043, 0x00000001, mgm_01_EnableMenus, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_EndBowserPanelAnimation, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080034, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080035, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080036, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080037, 0x00000043, 0x00000001, mgm_01_DoubleScore, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x000003FC, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080038, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_GiveCoinReward, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003A, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_DestroyBlockEntities, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000006, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000007, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000004, 0xFE363C8C, 0x00000005, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, mgm_01_GetPanelInfo, 0xFE363C8A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, mgm_01_InitPanelEmergeFromBlock, 0xFE363C8A, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000003, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mgm_01_InitPanelHoldAboveBlock, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000005, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000002, mgm_01_InitPanelMoveToTally, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000007, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000002, mgm_01_EndPanelAnimation, 0xFE363C8A, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000009, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, mgm_01_UpdatePanelEmergeFromBlock, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000004, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000002, mgm_01_UpdatetPanelHoldAboveBlock, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000006, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000002, mgm_01_UpdatePanelMoveToTally, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000003, mgm_01_SetPanelState, 0xFE363C8A, 0x00000008, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000009, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000002, mgm_01_GetPanelPos, 0xFE363C8A, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C88, 0xF24A7A80, 0xF24A7E80, 0xF24A7A80, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xFE363C89, 0xFE363C89, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000004, 0x00000001, 0x00000063, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000063, 0x00000043, 0x00000001, mgm_01_EnableMenus, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00002017, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_EndBowserPanelAnimation, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080034, 0x00000016, 0x00000001, 0x00000002, 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080035, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080036, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080037, 0x00000043, 0x00000001, mgm_01_DoubleScore, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x000003FC, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, mgm_01_UpdateRecords, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x00080038, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_GiveCoinReward, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00830004, 0x00830001, 0x00000000, 0x0008003A, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, mgm_01_DestroyBlockEntities, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80242310 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80242330 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80242350 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80242370 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80242390 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_802423B0 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000005, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_802423D0 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000006, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_802423F0 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000007, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80242410 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80242430 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +dlabel D_80242450 +.word 0x00000043, 0x00000002, mgm_01_OnBreakBlock, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242470_E14BD0 .word 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000002, 0xFFFFFFFF, 0x00000043, 0x00000001, mgm_01_InitializePanels, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mgm_01_CreateMinigame, 0x00000044, 0x00000001, D_80242470_E14BD0, 0x00000044, 0x00000001, D_80241C4C_E143AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/nonmatchings/163400/mainmenu_draw_rect.s b/ver/us/asm/nonmatchings/163400/mainmenu_draw_rect.s deleted file mode 100644 index 4068c2827a..0000000000 --- a/ver/us/asm/nonmatchings/163400/mainmenu_draw_rect.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel mainmenu_draw_rect -/* 163400 80242BA0 2882F581 */ slti $v0, $a0, -0xa7f -/* 163404 80242BA4 8FA90014 */ lw $t1, 0x14($sp) -/* 163408 80242BA8 8FAA0018 */ lw $t2, 0x18($sp) -/* 16340C 80242BAC 8FAB001C */ lw $t3, 0x1c($sp) -/* 163410 80242BB0 8FAC0020 */ lw $t4, 0x20($sp) -/* 163414 80242BB4 14400075 */ bnez $v0, .L80242D8C -/* 163418 80242BB8 28A2F581 */ slti $v0, $a1, -0xa7f -/* 16341C 80242BBC 14400073 */ bnez $v0, .L80242D8C -/* 163420 80242BC0 00000000 */ nop -/* 163424 80242BC4 18C00071 */ blez $a2, .L80242D8C -/* 163428 80242BC8 00000000 */ nop -/* 16342C 80242BCC 18E0006F */ blez $a3, .L80242D8C -/* 163430 80242BD0 28820500 */ slti $v0, $a0, 0x500 -/* 163434 80242BD4 1040006D */ beqz $v0, .L80242D8C -/* 163438 80242BD8 28A203C0 */ slti $v0, $a1, 0x3c0 -/* 16343C 80242BDC 1040006B */ beqz $v0, .L80242D8C -/* 163440 80242BE0 28C20A80 */ slti $v0, $a2, 0xa80 -/* 163444 80242BE4 10400069 */ beqz $v0, .L80242D8C -/* 163448 80242BE8 28E20A80 */ slti $v0, $a3, 0xa80 -/* 16344C 80242BEC 10400067 */ beqz $v0, .L80242D8C -/* 163450 80242BF0 00000000 */ nop -/* 163454 80242BF4 3C02800A */ lui $v0, %hi(gMasterGfxPos) -/* 163458 80242BF8 2442A66C */ addiu $v0, $v0, %lo(gMasterGfxPos) -/* 16345C 80242BFC 8C480000 */ lw $t0, ($v0) -/* 163460 80242C00 25030008 */ addiu $v1, $t0, 8 -/* 163464 80242C04 AC430000 */ sw $v1, ($v0) -/* 163468 80242C08 00061400 */ sll $v0, $a2, 0x10 -/* 16346C 80242C0C 00021403 */ sra $v0, $v0, 0x10 -/* 163470 80242C10 18400005 */ blez $v0, .L80242C28 -/* 163474 80242C14 30420FFF */ andi $v0, $v0, 0xfff -/* 163478 80242C18 00021300 */ sll $v0, $v0, 0xc -/* 16347C 80242C1C 3C03E400 */ lui $v1, 0xe400 -/* 163480 80242C20 08090B0B */ j .L80242C2C -/* 163484 80242C24 00431825 */ or $v1, $v0, $v1 -.L80242C28: -/* 163488 80242C28 3C03E400 */ lui $v1, 0xe400 -.L80242C2C: -/* 16348C 80242C2C 00071400 */ sll $v0, $a3, 0x10 -/* 163490 80242C30 00021403 */ sra $v0, $v0, 0x10 -/* 163494 80242C34 18400004 */ blez $v0, .L80242C48 -/* 163498 80242C38 AD030000 */ sw $v1, ($t0) -/* 16349C 80242C3C 30420FFF */ andi $v0, $v0, 0xfff -/* 1634A0 80242C40 00621025 */ or $v0, $v1, $v0 -/* 1634A4 80242C44 AD020000 */ sw $v0, ($t0) -.L80242C48: -/* 1634A8 80242C48 8FA20010 */ lw $v0, 0x10($sp) -/* 1634AC 80242C4C 30420007 */ andi $v0, $v0, 7 -/* 1634B0 80242C50 00021E00 */ sll $v1, $v0, 0x18 -/* 1634B4 80242C54 00041400 */ sll $v0, $a0, 0x10 -/* 1634B8 80242C58 00023403 */ sra $a2, $v0, 0x10 -/* 1634BC 80242C5C 18C00003 */ blez $a2, .L80242C6C -/* 1634C0 80242C60 30C20FFF */ andi $v0, $a2, 0xfff -/* 1634C4 80242C64 00021300 */ sll $v0, $v0, 0xc -/* 1634C8 80242C68 00621825 */ or $v1, $v1, $v0 -.L80242C6C: -/* 1634CC 80242C6C 00051400 */ sll $v0, $a1, 0x10 -/* 1634D0 80242C70 00021403 */ sra $v0, $v0, 0x10 -/* 1634D4 80242C74 18400004 */ blez $v0, .L80242C88 -/* 1634D8 80242C78 AD030004 */ sw $v1, 4($t0) -/* 1634DC 80242C7C 30420FFF */ andi $v0, $v0, 0xfff -/* 1634E0 80242C80 00621025 */ or $v0, $v1, $v0 -/* 1634E4 80242C84 AD020004 */ sw $v0, 4($t0) -.L80242C88: -/* 1634E8 80242C88 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 1634EC 80242C8C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 1634F0 80242C90 8C620000 */ lw $v0, ($v1) -/* 1634F4 80242C94 0040202D */ daddu $a0, $v0, $zero -/* 1634F8 80242C98 24420008 */ addiu $v0, $v0, 8 -/* 1634FC 80242C9C AC620000 */ sw $v0, ($v1) -/* 163500 80242CA0 3C02E100 */ lui $v0, 0xe100 -/* 163504 80242CA4 AC820000 */ sw $v0, ($a0) -/* 163508 80242CA8 04C10012 */ bgez $a2, .L80242CF4 -/* 16350C 80242CAC 24840004 */ addiu $a0, $a0, 4 -/* 163510 80242CB0 000B1400 */ sll $v0, $t3, 0x10 -/* 163514 80242CB4 00021403 */ sra $v0, $v0, 0x10 -/* 163518 80242CB8 04410007 */ bgez $v0, .L80242CD8 -/* 16351C 80242CBC 00C20018 */ mult $a2, $v0 -/* 163520 80242CC0 00006812 */ mflo $t5 -/* 163524 80242CC4 000D11C3 */ sra $v0, $t5, 7 -/* 163528 80242CC8 04410008 */ bgez $v0, .L80242CEC -/* 16352C 80242CCC 01221023 */ subu $v0, $t1, $v0 -/* 163530 80242CD0 08090B3A */ j .L80242CE8 -/* 163534 80242CD4 0000102D */ daddu $v0, $zero, $zero -.L80242CD8: -/* 163538 80242CD8 00006812 */ mflo $t5 -/* 16353C 80242CDC 000D11C3 */ sra $v0, $t5, 7 -/* 163540 80242CE0 5C400001 */ bgtzl $v0, .L80242CE8 -/* 163544 80242CE4 0000102D */ daddu $v0, $zero, $zero -.L80242CE8: -/* 163548 80242CE8 01221023 */ subu $v0, $t1, $v0 -.L80242CEC: -/* 16354C 80242CEC 08090B3E */ j .L80242CF8 -/* 163550 80242CF0 00023400 */ sll $a2, $v0, 0x10 -.L80242CF4: -/* 163554 80242CF4 00093400 */ sll $a2, $t1, 0x10 -.L80242CF8: -/* 163558 80242CF8 04A10016 */ bgez $a1, .L80242D54 -/* 16355C 80242CFC 3142FFFF */ andi $v0, $t2, 0xffff -/* 163560 80242D00 000C1400 */ sll $v0, $t4, 0x10 -/* 163564 80242D04 00021C03 */ sra $v1, $v0, 0x10 -/* 163568 80242D08 0461000A */ bgez $v1, .L80242D34 -/* 16356C 80242D0C 00051400 */ sll $v0, $a1, 0x10 -/* 163570 80242D10 00021403 */ sra $v0, $v0, 0x10 -/* 163574 80242D14 00430018 */ mult $v0, $v1 -/* 163578 80242D18 00006812 */ mflo $t5 -/* 16357C 80242D1C 000D11C3 */ sra $v0, $t5, 7 -/* 163580 80242D20 04420001 */ bltzl $v0, .L80242D28 -/* 163584 80242D24 0000102D */ daddu $v0, $zero, $zero -.L80242D28: -/* 163588 80242D28 01421023 */ subu $v0, $t2, $v0 -/* 16358C 80242D2C 08090B55 */ j .L80242D54 -/* 163590 80242D30 3042FFFF */ andi $v0, $v0, 0xffff -.L80242D34: -/* 163594 80242D34 00021403 */ sra $v0, $v0, 0x10 -/* 163598 80242D38 00430018 */ mult $v0, $v1 -/* 16359C 80242D3C 00006812 */ mflo $t5 -/* 1635A0 80242D40 000D11C3 */ sra $v0, $t5, 7 -/* 1635A4 80242D44 5C400001 */ bgtzl $v0, .L80242D4C -/* 1635A8 80242D48 0000102D */ daddu $v0, $zero, $zero -.L80242D4C: -/* 1635AC 80242D4C 01421023 */ subu $v0, $t2, $v0 -/* 1635B0 80242D50 3042FFFF */ andi $v0, $v0, 0xffff -.L80242D54: -/* 1635B4 80242D54 00C21025 */ or $v0, $a2, $v0 -/* 1635B8 80242D58 AC820000 */ sw $v0, ($a0) -/* 1635BC 80242D5C 3C03800A */ lui $v1, %hi(gMasterGfxPos) -/* 1635C0 80242D60 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) -/* 1635C4 80242D64 8C620000 */ lw $v0, ($v1) -/* 1635C8 80242D68 0040202D */ daddu $a0, $v0, $zero -/* 1635CC 80242D6C 24420008 */ addiu $v0, $v0, 8 -/* 1635D0 80242D70 AC620000 */ sw $v0, ($v1) -/* 1635D4 80242D74 3C02F100 */ lui $v0, 0xf100 -/* 1635D8 80242D78 AC820000 */ sw $v0, ($a0) -/* 1635DC 80242D7C 000B1400 */ sll $v0, $t3, 0x10 -/* 1635E0 80242D80 3183FFFF */ andi $v1, $t4, 0xffff -/* 1635E4 80242D84 00431025 */ or $v0, $v0, $v1 -/* 1635E8 80242D88 AC820004 */ sw $v0, 4($a0) -.L80242D8C: -/* 1635EC 80242D8C 03E00008 */ jr $ra -/* 1635F0 80242D90 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/190B20/func_802666E4.s b/ver/us/asm/nonmatchings/190B20/func_802666E4.s deleted file mode 100644 index bcbe215075..0000000000 --- a/ver/us/asm/nonmatchings/190B20/func_802666E4.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802666E4 -/* 194FC4 802666E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 194FC8 802666E8 44850000 */ mtc1 $a1, $f0 -/* 194FCC 802666EC 44861000 */ mtc1 $a2, $f2 -/* 194FD0 802666F0 44872000 */ mtc1 $a3, $f4 -/* 194FD4 802666F4 8FA30030 */ lw $v1, 0x30($sp) -/* 194FD8 802666F8 3C05800E */ lui $a1, %hi(gBattleStatus) -/* 194FDC 802666FC 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus) -/* 194FE0 80266700 28620003 */ slti $v0, $v1, 3 -/* 194FE4 80266704 10400003 */ beqz $v0, .L80266714 -/* 194FE8 80266708 AFBF0018 */ sw $ra, 0x18($sp) -/* 194FEC 8026670C 080999E9 */ j .L802667A4 -/* 194FF0 80266710 0000402D */ daddu $t0, $zero, $zero -.L80266714: -/* 194FF4 80266714 28620005 */ slti $v0, $v1, 5 -/* 194FF8 80266718 1040001E */ beqz $v0, .L80266794 -/* 194FFC 8026671C 24080001 */ addiu $t0, $zero, 1 -/* 195000 80266720 080999E9 */ j .L802667A4 -/* 195004 80266724 00000000 */ nop -.L80266728: -/* 195008 80266728 0000202D */ daddu $a0, $zero, $zero -/* 19500C 8026672C 44050000 */ mfc1 $a1, $f0 -/* 195010 80266730 44061000 */ mfc1 $a2, $f2 -/* 195014 80266734 44072000 */ mfc1 $a3, $f4 -/* 195018 80266738 3C013F80 */ lui $at, 0x3f80 -/* 19501C 8026673C 44810000 */ mtc1 $at, $f0 -/* 195020 80266740 24020018 */ addiu $v0, $zero, 0x18 -/* 195024 80266744 AFA20014 */ sw $v0, 0x14($sp) -/* 195028 80266748 0C01C184 */ jal fx_ring_blast -/* 19502C 8026674C E7A00010 */ swc1 $f0, 0x10($sp) -/* 195030 80266750 080999F9 */ j .L802667E4 -/* 195034 80266754 00000000 */ nop -.L80266758: -/* 195038 80266758 0C09451D */ jal func_80251474 -/* 19503C 8026675C 00000000 */ nop -/* 195040 80266760 080999F9 */ j .L802667E4 -/* 195044 80266764 00000000 */ nop -.L80266768: -/* 195048 80266768 44050000 */ mfc1 $a1, $f0 -/* 19504C 8026676C 44061000 */ mfc1 $a2, $f2 -/* 195050 80266770 44072000 */ mfc1 $a3, $f4 -/* 195054 80266774 3C013F80 */ lui $at, 0x3f80 -/* 195058 80266778 44810000 */ mtc1 $at, $f0 -/* 19505C 8026677C 24020018 */ addiu $v0, $zero, 0x18 -/* 195060 80266780 AFA20014 */ sw $v0, 0x14($sp) -/* 195064 80266784 0C01C70C */ jal fx_water_splash -/* 195068 80266788 E7A00010 */ swc1 $f0, 0x10($sp) -/* 19506C 8026678C 080999F9 */ j .L802667E4 -/* 195070 80266790 00000000 */ nop -.L80266794: -/* 195074 80266794 28620009 */ slti $v0, $v1, 9 -/* 195078 80266798 10400002 */ beqz $v0, .L802667A4 -/* 19507C 8026679C 24080003 */ addiu $t0, $zero, 3 -/* 195080 802667A0 24080002 */ addiu $t0, $zero, 2 -.L802667A4: -/* 195084 802667A4 8CA30188 */ lw $v1, 0x188($a1) -/* 195088 802667A8 30620002 */ andi $v0, $v1, 2 -/* 19508C 802667AC 1440FFDE */ bnez $v0, .L80266728 -/* 195090 802667B0 30620020 */ andi $v0, $v1, 0x20 -/* 195094 802667B4 1440FFE8 */ bnez $v0, .L80266758 -/* 195098 802667B8 30620004 */ andi $v0, $v1, 4 -/* 19509C 802667BC 1440FFEA */ bnez $v0, .L80266768 -/* 1950A0 802667C0 0000202D */ daddu $a0, $zero, $zero -/* 1950A4 802667C4 44050000 */ mfc1 $a1, $f0 -/* 1950A8 802667C8 44061000 */ mfc1 $a2, $f2 -/* 1950AC 802667CC 44072000 */ mfc1 $a3, $f4 -/* 1950B0 802667D0 3C013F80 */ lui $at, 0x3f80 -/* 1950B4 802667D4 44810000 */ mtc1 $at, $f0 -/* 1950B8 802667D8 AFA80014 */ sw $t0, 0x14($sp) -/* 1950BC 802667DC 0C01C46C */ jal fx_firework -/* 1950C0 802667E0 E7A00010 */ swc1 $f0, 0x10($sp) -.L802667E4: -/* 1950C4 802667E4 8FBF0018 */ lw $ra, 0x18($sp) -/* 1950C8 802667E8 03E00008 */ jr $ra -/* 1950CC 802667EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s b/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s deleted file mode 100644 index caf9af403c..0000000000 --- a/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8029D700 -.word .L80268C90_197570, .L80268B28_197408, .L80268B38_197418, .L80268B48_197428, .L80268B58_197438, .L80268B68_197448, .L80268B78_197458, .L80268B88_197468, .L80268B98_197478, .L80268BA8_197488, .L80268BB8_197498, .L80268BC8_1974A8, .L80268BD8_1974B8, .L80268BE8_1974C8, .L80268BF8_1974D8, .L80268C08_1974E8, .L80268C18_1974F8, .L80268C28_197508, .L80268C38_197518, .L80268C48_197528, .L80268C58_197538, .L80268C68_197548, .L80268C78_197558, .L80268C88_197568 - -.section .text - -glabel func_80268AF8 -/* 1973D8 80268AF8 3C03802A */ lui $v1, %hi(D_8029FC2A) -/* 1973DC 80268AFC 8463FC2A */ lh $v1, %lo(D_8029FC2A)($v1) -/* 1973E0 80268B00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1973E4 80268B04 2C620018 */ sltiu $v0, $v1, 0x18 -/* 1973E8 80268B08 10400061 */ beqz $v0, .L80268C90_197570 -/* 1973EC 80268B0C AFBF0010 */ sw $ra, 0x10($sp) -/* 1973F0 80268B10 00031080 */ sll $v0, $v1, 2 -/* 1973F4 80268B14 3C01802A */ lui $at, %hi(jtbl_8029D700) -/* 1973F8 80268B18 00220821 */ addu $at, $at, $v0 -/* 1973FC 80268B1C 8C22D700 */ lw $v0, %lo(jtbl_8029D700)($at) -/* 197400 80268B20 00400008 */ jr $v0 -/* 197404 80268B24 00000000 */ nop -.L80268B28_197408: -/* 197408 80268B28 0C0AA551 */ jal action_command_jump_draw_hud_elements -/* 19740C 80268B2C 00000000 */ nop -/* 197410 80268B30 0809A324 */ j .L80268C90_197570 -/* 197414 80268B34 00000000 */ nop -.L80268B38_197418: -/* 197418 80268B38 0C0AA675 */ jal action_command_hammer_draw_hud_elements -/* 19741C 80268B3C 00000000 */ nop -/* 197420 80268B40 0809A324 */ j .L80268C90_197570 -/* 197424 80268B44 00000000 */ nop -.L80268B48_197428: -/* 197428 80268B48 0C0AA5BD */ jal func_802A96F4_4231C4 -/* 19742C 80268B4C 00000000 */ nop -/* 197430 80268B50 0809A324 */ j .L80268C90_197570 -/* 197434 80268B54 00000000 */ nop -.L80268B58_197438: -/* 197438 80268B58 0C0AA5AE */ jal func_802A96B8_423AA8 -/* 19743C 80268B5C 00000000 */ nop -/* 197440 80268B60 0809A324 */ j .L80268C90_197570 -/* 197444 80268B64 00000000 */ nop -.L80268B68_197448: -/* 197448 80268B68 0C0AA5D1 */ jal func_802A9744_4243B4 -/* 19744C 80268B6C 00000000 */ nop -/* 197450 80268B70 0809A324 */ j .L80268C90_197570 -/* 197454 80268B74 00000000 */ nop -.L80268B78_197458: -/* 197458 80268B78 0C0AA529 */ jal func_802A94A4_425A34 -/* 19745C 80268B7C 00000000 */ nop -/* 197460 80268B80 0809A324 */ j .L80268C90_197570 -/* 197464 80268B84 00000000 */ nop -.L80268B88_197468: -/* 197468 80268B88 0C0AA536 */ jal func_802A94D8_426028 -/* 19746C 80268B8C 00000000 */ nop -/* 197470 80268B90 0809A324 */ j .L80268C90_197570 -/* 197474 80268B94 00000000 */ nop -.L80268B98_197478: -/* 197478 80268B98 0C0AA5B7 */ jal action_command_dizzy_shell_UnkActionCommandFunc1 -/* 19747C 80268B9C 00000000 */ nop -/* 197480 80268BA0 0809A324 */ j .L80268C90_197570 -/* 197484 80268BA4 00000000 */ nop -.L80268BA8_197488: -/* 197488 80268BA8 0C0AA60D */ jal action_command_fire_shell_UnkActionCommandFunc1 -/* 19748C 80268BAC 00000000 */ nop -/* 197490 80268BB0 0809A324 */ j .L80268C90_197570 -/* 197494 80268BB4 00000000 */ nop -.L80268BB8_197498: -/* 197498 80268BB8 0C0AA557 */ jal action_command_0A_UnkActionCommandFunc1 -/* 19749C 80268BBC 00000000 */ nop -/* 1974A0 80268BC0 0809A324 */ j .L80268C90_197570 -/* 1974A4 80268BC4 00000000 */ nop -.L80268BC8_1974A8: -/* 1974A8 80268BC8 0C0AA5BB */ jal action_command_bomb_UnkActionCommandFunc1 -/* 1974AC 80268BCC 00000000 */ nop -/* 1974B0 80268BD0 0809A324 */ j .L80268C90_197570 -/* 1974B4 80268BD4 00000000 */ nop -.L80268BD8_1974B8: -/* 1974B8 80268BD8 0C0AA599 */ jal action_command_body_slam_draw_hud_elements -/* 1974BC 80268BDC 00000000 */ nop -/* 1974C0 80268BE0 0809A324 */ j .L80268C90_197570 -/* 1974C4 80268BE4 00000000 */ nop -.L80268BE8_1974C8: -/* 1974C8 80268BE8 0C0AA5BB */ jal action_command_bomb_UnkActionCommandFunc1 -/* 1974CC 80268BEC 00000000 */ nop -/* 1974D0 80268BF0 0809A324 */ j .L80268C90_197570 -/* 1974D4 80268BF4 00000000 */ nop -.L80268BF8_1974D8: -/* 1974D8 80268BF8 0C0AA613 */ jal action_command_air_raid_UnkActionCommandFunc1 -/* 1974DC 80268BFC 00000000 */ nop -/* 1974E0 80268C00 0809A324 */ j .L80268C90_197570 -/* 1974E4 80268C04 00000000 */ nop -.L80268C08_1974E8: -/* 1974E8 80268C08 0C0AA58D */ jal func_802A9634_42A354 -/* 1974EC 80268C0C 00000000 */ nop -/* 1974F0 80268C10 0809A324 */ j .L80268C90_197570 -/* 1974F4 80268C14 00000000 */ nop -.L80268C18_1974F8: -/* 1974F8 80268C18 0C0AA634 */ jal action_command_power_shock_draw_hud_elements -/* 1974FC 80268C1C 00000000 */ nop -/* 197500 80268C20 0809A324 */ j .L80268C90_197570 -/* 197504 80268C24 00000000 */ nop -.L80268C28_197508: -/* 197508 80268C28 0C0AA5FE */ jal func_802A97F8_42E208 -/* 19750C 80268C2C 00000000 */ nop -/* 197510 80268C30 0809A324 */ j .L80268C90_197570 -/* 197514 80268C34 00000000 */ nop -.L80268C38_197518: -/* 197518 80268C38 0C0AA62C */ jal action_command_smack_UnkActionCommandFunc1 -/* 19751C 80268C3C 00000000 */ nop -/* 197520 80268C40 0809A324 */ j .L80268C90_197570 -/* 197524 80268C44 00000000 */ nop -.L80268C48_197528: -/* 197528 80268C48 0C0AA5CF */ jal action_command_spiny_surge_UnkActionCommandFunc1 -/* 19752C 80268C4C 00000000 */ nop -/* 197530 80268C50 0809A324 */ j .L80268C90_197570 -/* 197534 80268C54 00000000 */ nop -.L80268C58_197538: -/* 197538 80268C58 0C0AA5EB */ jal func_802A97AC_42FE8C -/* 19753C 80268C5C 00000000 */ nop -/* 197540 80268C60 0809A324 */ j .L80268C90_197570 -/* 197544 80268C64 00000000 */ nop -.L80268C68_197548: -/* 197548 80268C68 0C0AA5FF */ jal func_802A97FC_423BEC -/* 19754C 80268C6C 00000000 */ nop -/* 197550 80268C70 0809A324 */ j .L80268C90_197570 -/* 197554 80268C74 00000000 */ nop -.L80268C78_197558: -/* 197558 80268C78 0C0AA805 */ jal func_802AA014_42B504 -/* 19755C 80268C7C 00000000 */ nop -/* 197560 80268C80 0809A324 */ j .L80268C90_197570 -/* 197564 80268C84 00000000 */ nop -.L80268C88_197568: -/* 197568 80268C88 0C0AA5C6 */ jal action_command_tidal_wave_draw_hud_elements -/* 19756C 80268C8C 00000000 */ nop -.L80268C90_197570: -/* 197570 80268C90 8FBF0010 */ lw $ra, 0x10($sp) -/* 197574 80268C94 03E00008 */ jr $ra -/* 197578 80268C98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s b/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s deleted file mode 100644 index e4a554f7e4..0000000000 --- a/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s +++ /dev/null @@ -1,159 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel jtbl_8029D760 -.word .L80268E3C_19771C, .L80268CD4_1975B4, .L80268CE4_1975C4, .L80268CF4_1975D4, .L80268D04_1975E4, .L80268D14_1975F4, .L80268D24_197604, .L80268D34_197614, .L80268D44_197624, .L80268D54_197634, .L80268D64_197644, .L80268D74_197654, .L80268D84_197664, .L80268D94_197674, .L80268DA4_197684, .L80268DB4_197694, .L80268DC4_1976A4, .L80268DD4_1976B4, .L80268DE4_1976C4, .L80268DF4_1976D4, .L80268E04_1976E4, .L80268E14_1976F4, .L80268E24_197704, .L80268E34_197714 - -.section .text - -glabel func_80268C9C -/* 19757C 80268C9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 197580 80268CA0 AFB00010 */ sw $s0, 0x10($sp) -/* 197584 80268CA4 3C10802A */ lui $s0, %hi(gActionCommandStatus) -/* 197588 80268CA8 2610FBE0 */ addiu $s0, $s0, %lo(gActionCommandStatus) -/* 19758C 80268CAC AFBF0014 */ sw $ra, 0x14($sp) -/* 197590 80268CB0 8603004A */ lh $v1, 0x4a($s0) -/* 197594 80268CB4 2C620018 */ sltiu $v0, $v1, 0x18 -/* 197598 80268CB8 10400060 */ beqz $v0, .L80268E3C_19771C -/* 19759C 80268CBC 00031080 */ sll $v0, $v1, 2 -/* 1975A0 80268CC0 3C01802A */ lui $at, %hi(jtbl_8029D760) -/* 1975A4 80268CC4 00220821 */ addu $at, $at, $v0 -/* 1975A8 80268CC8 8C22D760 */ lw $v0, %lo(jtbl_8029D760)($at) -/* 1975AC 80268CCC 00400008 */ jr $v0 -/* 1975B0 80268CD0 00000000 */ nop -.L80268CD4_1975B4: -/* 1975B4 80268CD4 0C0AA564 */ jal action_command_jump_free_hud_elements -/* 1975B8 80268CD8 00000000 */ nop -/* 1975BC 80268CDC 0809A390 */ j .L80268E40 -/* 1975C0 80268CE0 3C05FFFF */ lui $a1, 0xffff -.L80268CE4_1975C4: -/* 1975C4 80268CE4 0C0AA68C */ jal action_command_hammer_free_hud_elements -/* 1975C8 80268CE8 00000000 */ nop -/* 1975CC 80268CEC 0809A390 */ j .L80268E40 -/* 1975D0 80268CF0 3C05FFFF */ lui $a1, 0xffff -.L80268CF4_1975D4: -/* 1975D4 80268CF4 0C0AA625 */ jal func_802A9894_423364 -/* 1975D8 80268CF8 00000000 */ nop -/* 1975DC 80268CFC 0809A390 */ j .L80268E40 -/* 1975E0 80268D00 3C05FFFF */ lui $a1, 0xffff -.L80268D04_1975E4: -/* 1975E4 80268D04 0C0AA5FF */ jal func_802A97FC_423BEC -/* 1975E8 80268D08 00000000 */ nop -/* 1975EC 80268D0C 0809A390 */ j .L80268E40 -/* 1975F0 80268D10 3C05FFFF */ lui $a1, 0xffff -.L80268D14_1975F4: -/* 1975F4 80268D14 0C0AA626 */ jal func_802A9898_424508 -/* 1975F8 80268D18 00000000 */ nop -/* 1975FC 80268D1C 0809A390 */ j .L80268E40 -/* 197600 80268D20 3C05FFFF */ lui $a1, 0xffff -.L80268D24_197604: -/* 197604 80268D24 0C0AA551 */ jal action_command_jump_draw_hud_elements -/* 197608 80268D28 00000000 */ nop -/* 19760C 80268D2C 0809A390 */ j .L80268E40 -/* 197610 80268D30 3C05FFFF */ lui $a1, 0xffff -.L80268D34_197614: -/* 197614 80268D34 0C0AA567 */ jal action_command_07_free_hud_elements -/* 197618 80268D38 00000000 */ nop -/* 19761C 80268D3C 0809A390 */ j .L80268E40 -/* 197620 80268D40 3C05FFFF */ lui $a1, 0xffff -.L80268D44_197624: -/* 197624 80268D44 0C0AA5EF */ jal action_command_dizzy_shell_free_hud_elements -/* 197628 80268D48 00000000 */ nop -/* 19762C 80268D4C 0809A390 */ j .L80268E40 -/* 197630 80268D50 3C05FFFF */ lui $a1, 0xffff -.L80268D54_197634: -/* 197634 80268D54 0C0AA645 */ jal action_command_fire_shell_free_hud_elements -/* 197638 80268D58 00000000 */ nop -/* 19763C 80268D5C 0809A390 */ j .L80268E40 -/* 197640 80268D60 3C05FFFF */ lui $a1, 0xffff -.L80268D64_197644: -/* 197644 80268D64 0C0AA58F */ jal action_command_0A_free_hud_elements -/* 197648 80268D68 00000000 */ nop -/* 19764C 80268D6C 0809A390 */ j .L80268E40 -/* 197650 80268D70 3C05FFFF */ lui $a1, 0xffff -.L80268D74_197654: -/* 197654 80268D74 0C0AA5F3 */ jal action_command_bomb_free_hud_elements -/* 197658 80268D78 00000000 */ nop -/* 19765C 80268D7C 0809A390 */ j .L80268E40 -/* 197660 80268D80 3C05FFFF */ lui $a1, 0xffff -.L80268D84_197664: -/* 197664 80268D84 0C0AA5C2 */ jal action_command_body_slam_free_hud_elements -/* 197668 80268D88 00000000 */ nop -/* 19766C 80268D8C 0809A390 */ j .L80268E40 -/* 197670 80268D90 3C05FFFF */ lui $a1, 0xffff -.L80268D94_197674: -/* 197674 80268D94 0C0AA604 */ jal action_command_air_lift_free_hud_elements -/* 197678 80268D98 00000000 */ nop -/* 19767C 80268D9C 0809A390 */ j .L80268E40 -/* 197680 80268DA0 3C05FFFF */ lui $a1, 0xffff -.L80268DA4_197684: -/* 197684 80268DA4 0C0AA64B */ jal action_command_air_raid_free_hud_elements -/* 197688 80268DA8 00000000 */ nop -/* 19768C 80268DAC 0809A390 */ j .L80268E40 -/* 197690 80268DB0 3C05FFFF */ lui $a1, 0xffff -.L80268DB4_197694: -/* 197694 80268DB4 0C0AA5C8 */ jal func_802A9720_42A440 -/* 197698 80268DB8 00000000 */ nop -/* 19769C 80268DBC 0809A390 */ j .L80268E40 -/* 1976A0 80268DC0 3C05FFFF */ lui $a1, 0xffff -.L80268DC4_1976A4: -/* 1976A4 80268DC4 0C0AA695 */ jal action_command_power_shock_free_hud_elements -/* 1976A8 80268DC8 00000000 */ nop -/* 1976AC 80268DCC 0809A390 */ j .L80268E40 -/* 1976B0 80268DD0 3C05FFFF */ lui $a1, 0xffff -.L80268DD4_1976B4: -/* 1976B4 80268DD4 0C0AA638 */ jal func_802A98E0_42E2F0 -/* 1976B8 80268DD8 00000000 */ nop -/* 1976BC 80268DDC 0809A390 */ j .L80268E40 -/* 1976C0 80268DE0 3C05FFFF */ lui $a1, 0xffff -.L80268DE4_1976C4: -/* 1976C4 80268DE4 0C0AA664 */ jal action_command_smack_free_hud_elements -/* 1976C8 80268DE8 00000000 */ nop -/* 1976CC 80268DEC 0809A390 */ j .L80268E40 -/* 1976D0 80268DF0 3C05FFFF */ lui $a1, 0xffff -.L80268DF4_1976D4: -/* 1976D4 80268DF4 0C0AA607 */ jal action_command_spiny_surge_free_hud_elements -/* 1976D8 80268DF8 00000000 */ nop -/* 1976DC 80268DFC 0809A390 */ j .L80268E40 -/* 1976E0 80268E00 3C05FFFF */ lui $a1, 0xffff -.L80268E04_1976E4: -/* 1976E4 80268E04 0C0AA625 */ jal func_802A9894_423364 -/* 1976E8 80268E08 00000000 */ nop -/* 1976EC 80268E0C 0809A390 */ j .L80268E40 -/* 1976F0 80268E10 3C05FFFF */ lui $a1, 0xffff -.L80268E14_1976F4: -/* 1976F4 80268E14 0C0AA637 */ jal action_command_spook_free_hud_elements -/* 1976F8 80268E18 00000000 */ nop -/* 1976FC 80268E1C 0809A390 */ j .L80268E40 -/* 197700 80268E20 3C05FFFF */ lui $a1, 0xffff -.L80268E24_197704: -/* 197704 80268E24 0C0AA836 */ jal func_802AA0D8_42B5C8 -/* 197708 80268E28 00000000 */ nop -/* 19770C 80268E2C 0809A390 */ j .L80268E40 -/* 197710 80268E30 3C05FFFF */ lui $a1, 0xffff -.L80268E34_197714: -/* 197714 80268E34 0C0AA5D9 */ jal action_command_tidal_wave_free_hud_elements -/* 197718 80268E38 00000000 */ nop -.L80268E3C_19771C: -/* 19771C 80268E3C 3C05FFFF */ lui $a1, 0xffff -.L80268E40: -/* 197720 80268E40 34A57FFF */ ori $a1, $a1, 0x7fff -/* 197724 80268E44 3C04800E */ lui $a0, %hi(gBattleStatus) -/* 197728 80268E48 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) -/* 19772C 80268E4C A600004A */ sh $zero, 0x4a($s0) -/* 197730 80268E50 8C820000 */ lw $v0, ($a0) -/* 197734 80268E54 2403DFFF */ addiu $v1, $zero, -0x2001 -/* 197738 80268E58 00431024 */ and $v0, $v0, $v1 -/* 19773C 80268E5C 00451024 */ and $v0, $v0, $a1 -/* 197740 80268E60 2403BFFF */ addiu $v1, $zero, -0x4001 -/* 197744 80268E64 00431024 */ and $v0, $v0, $v1 -/* 197748 80268E68 0C093EC3 */ jal close_action_command_instruction_popup -/* 19774C 80268E6C AC820000 */ sw $v0, ($a0) -/* 197750 80268E70 0C093EB1 */ jal btl_set_popup_duration -/* 197754 80268E74 0000202D */ daddu $a0, $zero, $zero -/* 197758 80268E78 8FBF0014 */ lw $ra, 0x14($sp) -/* 19775C 80268E7C 8FB00010 */ lw $s0, 0x10($sp) -/* 197760 80268E80 03E00008 */ jr $ra -/* 197764 80268E84 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/EC71B0/func_80240344_EC74F4.s b/ver/us/asm/nonmatchings/EC71B0/func_80240344_EC74F4.s deleted file mode 100644 index 60c9c8918a..0000000000 --- a/ver/us/asm/nonmatchings/EC71B0/func_80240344_EC74F4.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344_EC74F4 -/* EC74F4 80240344 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* EC74F8 80240348 24020008 */ addiu $v0, $zero, 8 -/* EC74FC 8024034C 3C014348 */ lui $at, 0x4348 -/* EC7500 80240350 44810000 */ mtc1 $at, $f0 -/* EC7504 80240354 3C0142F0 */ lui $at, 0x42f0 -/* EC7508 80240358 44811000 */ mtc1 $at, $f2 -/* EC750C 8024035C 3C014080 */ lui $at, 0x4080 -/* EC7510 80240360 44812000 */ mtc1 $at, $f4 -/* EC7514 80240364 3C05C388 */ lui $a1, 0xc388 -/* EC7518 80240368 3C0642A0 */ lui $a2, 0x42a0 -/* EC751C 8024036C 3C0741A0 */ lui $a3, 0x41a0 -/* EC7520 80240370 24040003 */ addiu $a0, $zero, 3 -/* EC7524 80240374 AFBF0028 */ sw $ra, 0x28($sp) -/* EC7528 80240378 AFA2001C */ sw $v0, 0x1c($sp) -/* EC752C 8024037C AFA00020 */ sw $zero, 0x20($sp) -/* EC7530 80240380 E7A00010 */ swc1 $f0, 0x10($sp) -/* EC7534 80240384 E7A20014 */ swc1 $f2, 0x14($sp) -/* EC7538 80240388 0C01DD74 */ jal func_800775D0 -/* EC753C 8024038C E7A40018 */ swc1 $f4, 0x18($sp) -/* EC7540 80240390 8C43000C */ lw $v1, 0xc($v0) -/* EC7544 80240394 240500F0 */ addiu $a1, $zero, 0xf0 -/* EC7548 80240398 AC650038 */ sw $a1, 0x38($v1) -/* EC754C 8024039C 8C43000C */ lw $v1, 0xc($v0) -/* EC7550 802403A0 AC65003C */ sw $a1, 0x3c($v1) -/* EC7554 802403A4 8C43000C */ lw $v1, 0xc($v0) -/* EC7558 802403A8 AC650040 */ sw $a1, 0x40($v1) -/* EC755C 802403AC 8C43000C */ lw $v1, 0xc($v0) -/* EC7560 802403B0 240400E6 */ addiu $a0, $zero, 0xe6 -/* EC7564 802403B4 AC640048 */ sw $a0, 0x48($v1) -/* EC7568 802403B8 8C43000C */ lw $v1, 0xc($v0) -/* EC756C 802403BC AC64004C */ sw $a0, 0x4c($v1) -/* EC7570 802403C0 8C43000C */ lw $v1, 0xc($v0) -/* EC7574 802403C4 AC650050 */ sw $a1, 0x50($v1) -/* EC7578 802403C8 8FBF0028 */ lw $ra, 0x28($sp) -/* EC757C 802403CC 24020002 */ addiu $v0, $zero, 2 -/* EC7580 802403D0 03E00008 */ jr $ra -/* EC7584 802403D4 27BD0030 */ addiu $sp, $sp, 0x30 -/* EC7588 802403D8 00000000 */ nop -/* EC758C 802403DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s b/ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s deleted file mode 100644 index 68f92a9f2d..0000000000 --- a/ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242390_EE8940 -/* EE8940 80242390 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EE8944 80242394 AFBF0010 */ sw $ra, 0x10($sp) -/* EE8948 80242398 8C82000C */ lw $v0, 0xc($a0) -/* EE894C 8024239C 3C068017 */ lui $a2, %hi(D_80169B16) -/* EE8950 802423A0 84C69B16 */ lh $a2, %lo(D_80169B16)($a2) -/* EE8954 802423A4 0C0B551A */ jal dead_evt_set_variable -/* EE8958 802423A8 8C450000 */ lw $a1, ($v0) -/* EE895C 802423AC 8FBF0010 */ lw $ra, 0x10($sp) -/* EE8960 802423B0 24020002 */ addiu $v0, $zero, 2 -/* EE8964 802423B4 03E00008 */ jr $ra -/* EE8968 802423B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* EE896C 802423BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s deleted file mode 100644 index d57c880bd1..0000000000 --- a/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s +++ /dev/null @@ -1,352 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C90_EF42A0 -/* EF42A0 80241C90 27BDFF98 */ addiu $sp, $sp, -0x68 -/* EF42A4 80241C94 AFB40050 */ sw $s4, 0x50($sp) -/* EF42A8 80241C98 0080A02D */ daddu $s4, $a0, $zero -/* EF42AC 80241C9C AFBF005C */ sw $ra, 0x5c($sp) -/* EF42B0 80241CA0 AFB60058 */ sw $s6, 0x58($sp) -/* EF42B4 80241CA4 AFB50054 */ sw $s5, 0x54($sp) -/* EF42B8 80241CA8 AFB3004C */ sw $s3, 0x4c($sp) -/* EF42BC 80241CAC AFB20048 */ sw $s2, 0x48($sp) -/* EF42C0 80241CB0 AFB10044 */ sw $s1, 0x44($sp) -/* EF42C4 80241CB4 AFB00040 */ sw $s0, 0x40($sp) -/* EF42C8 80241CB8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* EF42CC 80241CBC 8E930148 */ lw $s3, 0x148($s4) -/* EF42D0 80241CC0 86640008 */ lh $a0, 8($s3) -/* EF42D4 80241CC4 8E90000C */ lw $s0, 0xc($s4) -/* EF42D8 80241CC8 0C00F92F */ jal dead_get_npc_unsafe -/* EF42DC 80241CCC 00A0882D */ daddu $s1, $a1, $zero -/* EF42E0 80241CD0 0280202D */ daddu $a0, $s4, $zero -/* EF42E4 80241CD4 8E050000 */ lw $a1, ($s0) -/* EF42E8 80241CD8 0C0B53A3 */ jal dead_evt_get_variable -/* EF42EC 80241CDC 0040902D */ daddu $s2, $v0, $zero -/* EF42F0 80241CE0 AFA00020 */ sw $zero, 0x20($sp) -/* EF42F4 80241CE4 8E6300D0 */ lw $v1, 0xd0($s3) -/* EF42F8 80241CE8 8C630030 */ lw $v1, 0x30($v1) -/* EF42FC 80241CEC AFA30024 */ sw $v1, 0x24($sp) -/* EF4300 80241CF0 8E6300D0 */ lw $v1, 0xd0($s3) -/* EF4304 80241CF4 8C63001C */ lw $v1, 0x1c($v1) -/* EF4308 80241CF8 AFA30028 */ sw $v1, 0x28($sp) -/* EF430C 80241CFC 8E6300D0 */ lw $v1, 0xd0($s3) -/* EF4310 80241D00 8C630024 */ lw $v1, 0x24($v1) -/* EF4314 80241D04 AFA3002C */ sw $v1, 0x2c($sp) -/* EF4318 80241D08 8E6300D0 */ lw $v1, 0xd0($s3) -/* EF431C 80241D0C 8C630028 */ lw $v1, 0x28($v1) -/* EF4320 80241D10 AFA30030 */ sw $v1, 0x30($sp) -/* EF4324 80241D14 8E6300D0 */ lw $v1, 0xd0($s3) -/* EF4328 80241D18 3C0142F0 */ lui $at, 0x42f0 -/* EF432C 80241D1C 44810000 */ mtc1 $at, $f0 -/* EF4330 80241D20 8C63002C */ lw $v1, 0x2c($v1) -/* EF4334 80241D24 E7A00038 */ swc1 $f0, 0x38($sp) -/* EF4338 80241D28 A7A0003C */ sh $zero, 0x3c($sp) -/* EF433C 80241D2C AFA30034 */ sw $v1, 0x34($sp) -/* EF4340 80241D30 C6400038 */ lwc1 $f0, 0x38($s2) -/* EF4344 80241D34 E6600108 */ swc1 $f0, 0x108($s3) -/* EF4348 80241D38 C640003C */ lwc1 $f0, 0x3c($s2) -/* EF434C 80241D3C 27B50020 */ addiu $s5, $sp, 0x20 -/* EF4350 80241D40 E660010C */ swc1 $f0, 0x10c($s3) -/* EF4354 80241D44 3C0138D1 */ lui $at, 0x38d1 -/* EF4358 80241D48 3421B717 */ ori $at, $at, 0xb717 -/* EF435C 80241D4C 44810000 */ mtc1 $at, $f0 -/* EF4360 80241D50 C6420040 */ lwc1 $f2, 0x40($s2) -/* EF4364 80241D54 0040B02D */ daddu $s6, $v0, $zero -/* EF4368 80241D58 E6600114 */ swc1 $f0, 0x114($s3) -/* EF436C 80241D5C E6600118 */ swc1 $f0, 0x118($s3) -/* EF4370 80241D60 12200007 */ beqz $s1, .L80241D80 -/* EF4374 80241D64 E6620110 */ swc1 $f2, 0x110($s3) -/* EF4378 80241D68 0240202D */ daddu $a0, $s2, $zero -/* EF437C 80241D6C 0260282D */ daddu $a1, $s3, $zero -/* EF4380 80241D70 0280302D */ daddu $a2, $s4, $zero -/* EF4384 80241D74 0C090496 */ jal EF2680_FlyingAI_Init -/* EF4388 80241D78 02C0382D */ daddu $a3, $s6, $zero -/* EF438C 80241D7C AE800070 */ sw $zero, 0x70($s4) -.L80241D80: -/* EF4390 80241D80 2402FFFD */ addiu $v0, $zero, -3 -/* EF4394 80241D84 A24200AB */ sb $v0, 0xab($s2) -/* EF4398 80241D88 8E6300B0 */ lw $v1, 0xb0($s3) -/* EF439C 80241D8C 30620004 */ andi $v0, $v1, 4 -/* EF43A0 80241D90 10400007 */ beqz $v0, .L80241DB0 -/* EF43A4 80241D94 00000000 */ nop -/* EF43A8 80241D98 826200B4 */ lb $v0, 0xb4($s3) -/* EF43AC 80241D9C 144000F4 */ bnez $v0, .L80242170 -/* EF43B0 80241DA0 0000102D */ daddu $v0, $zero, $zero -/* EF43B4 80241DA4 2402FFFB */ addiu $v0, $zero, -5 -/* EF43B8 80241DA8 00621024 */ and $v0, $v1, $v0 -/* EF43BC 80241DAC AE6200B0 */ sw $v0, 0xb0($s3) -.L80241DB0: -/* EF43C0 80241DB0 8E830070 */ lw $v1, 0x70($s4) -/* EF43C4 80241DB4 24020001 */ addiu $v0, $zero, 1 -/* EF43C8 80241DB8 10620011 */ beq $v1, $v0, .L80241E00 -/* EF43CC 80241DBC 28620002 */ slti $v0, $v1, 2 -/* EF43D0 80241DC0 10400005 */ beqz $v0, .L80241DD8 -/* EF43D4 80241DC4 24020002 */ addiu $v0, $zero, 2 -/* EF43D8 80241DC8 10600009 */ beqz $v1, .L80241DF0 -/* EF43DC 80241DCC 2402000C */ addiu $v0, $zero, 0xc -/* EF43E0 80241DD0 08090790 */ j .L80241E40 -/* EF43E4 80241DD4 00000000 */ nop -.L80241DD8: -/* EF43E8 80241DD8 1062000F */ beq $v1, $v0, .L80241E18 -/* EF43EC 80241DDC 24020003 */ addiu $v0, $zero, 3 -/* EF43F0 80241DE0 10620012 */ beq $v1, $v0, .L80241E2C -/* EF43F4 80241DE4 0280202D */ daddu $a0, $s4, $zero -/* EF43F8 80241DE8 0809078E */ j .L80241E38 -/* EF43FC 80241DEC 00000000 */ nop -.L80241DF0: -/* EF4400 80241DF0 0280202D */ daddu $a0, $s4, $zero -/* EF4404 80241DF4 02C0282D */ daddu $a1, $s6, $zero -/* EF4408 80241DF8 0C09001C */ jal EF2680_FlyingAI_WanderInit -/* EF440C 80241DFC 02A0302D */ daddu $a2, $s5, $zero -.L80241E00: -/* EF4410 80241E00 0280202D */ daddu $a0, $s4, $zero -/* EF4414 80241E04 02C0282D */ daddu $a1, $s6, $zero -/* EF4418 80241E08 0C090577 */ jal func_802415DC_EF3BEC -/* EF441C 80241E0C 02A0302D */ daddu $a2, $s5, $zero -/* EF4420 80241E10 0809078E */ j .L80241E38 -/* EF4424 80241E14 00000000 */ nop -.L80241E18: -/* EF4428 80241E18 0280202D */ daddu $a0, $s4, $zero -/* EF442C 80241E1C 02C0282D */ daddu $a1, $s6, $zero -/* EF4430 80241E20 0C090212 */ jal EF2680_FlyingAI_LoiterInit -/* EF4434 80241E24 02A0302D */ daddu $a2, $s5, $zero -/* EF4438 80241E28 0280202D */ daddu $a0, $s4, $zero -.L80241E2C: -/* EF443C 80241E2C 02C0282D */ daddu $a1, $s6, $zero -/* EF4440 80241E30 0C090690 */ jal func_80241A40_EF4050 -/* EF4444 80241E34 02A0302D */ daddu $a2, $s5, $zero -.L80241E38: -/* EF4448 80241E38 8E830070 */ lw $v1, 0x70($s4) -/* EF444C 80241E3C 2402000C */ addiu $v0, $zero, 0xc -.L80241E40: -/* EF4450 80241E40 1462001A */ bne $v1, $v0, .L80241EAC -/* EF4454 80241E44 00000000 */ nop -/* EF4458 80241E48 C64C0038 */ lwc1 $f12, 0x38($s2) -/* EF445C 80241E4C 3C028010 */ lui $v0, %hi(dead_gPlayerStatusPtr) -/* EF4460 80241E50 8C42FC90 */ lw $v0, %lo(dead_gPlayerStatusPtr)($v0) -/* EF4464 80241E54 C64E0040 */ lwc1 $f14, 0x40($s2) -/* EF4468 80241E58 8C460028 */ lw $a2, 0x28($v0) -/* EF446C 80241E5C 0C00ABDC */ jal fio_validate_header_checksums -/* EF4470 80241E60 8C470030 */ lw $a3, 0x30($v0) -/* EF4474 80241E64 0C090565 */ jal func_80241594_EF3BA4 -/* EF4478 80241E68 E640000C */ swc1 $f0, 0xc($s2) -/* EF447C 80241E6C 0440000F */ bltz $v0, .L80241EAC -/* EF4480 80241E70 AE62007C */ sw $v0, 0x7c($s3) -/* EF4484 80241E74 0C010ABD */ jal dead_get_enemy -/* EF4488 80241E78 0040202D */ daddu $a0, $v0, $zero -/* EF448C 80241E7C 3C030049 */ lui $v1, 0x49 -/* EF4490 80241E80 0040202D */ daddu $a0, $v0, $zero -/* EF4494 80241E84 24020001 */ addiu $v0, $zero, 1 -/* EF4498 80241E88 AC820094 */ sw $v0, 0x94($a0) -/* EF449C 80241E8C 86620008 */ lh $v0, 8($s3) -/* EF44A0 80241E90 34630014 */ ori $v1, $v1, 0x14 -/* EF44A4 80241E94 AC820098 */ sw $v0, 0x98($a0) -/* EF44A8 80241E98 2402000F */ addiu $v0, $zero, 0xf -/* EF44AC 80241E9C A642008E */ sh $v0, 0x8e($s2) -/* EF44B0 80241EA0 2402001E */ addiu $v0, $zero, 0x1e -/* EF44B4 80241EA4 AE430028 */ sw $v1, 0x28($s2) -/* EF44B8 80241EA8 AE820070 */ sw $v0, 0x70($s4) -.L80241EAC: -/* EF44BC 80241EAC 8E830070 */ lw $v1, 0x70($s4) -/* EF44C0 80241EB0 2402000D */ addiu $v0, $zero, 0xd -/* EF44C4 80241EB4 10620010 */ beq $v1, $v0, .L80241EF8 -/* EF44C8 80241EB8 2862000E */ slti $v0, $v1, 0xe -/* EF44CC 80241EBC 10400005 */ beqz $v0, .L80241ED4 -/* EF44D0 80241EC0 2402000C */ addiu $v0, $zero, 0xc -/* EF44D4 80241EC4 10620008 */ beq $v1, $v0, .L80241EE8 -/* EF44D8 80241EC8 2410001F */ addiu $s0, $zero, 0x1f -/* EF44DC 80241ECC 080907C9 */ j .L80241F24 -/* EF44E0 80241ED0 00000000 */ nop -.L80241ED4: -/* EF44E4 80241ED4 2402000E */ addiu $v0, $zero, 0xe -/* EF44E8 80241ED8 1062000D */ beq $v1, $v0, .L80241F10 -/* EF44EC 80241EDC 0280202D */ daddu $a0, $s4, $zero -/* EF44F0 80241EE0 080907C7 */ j .L80241F1C -/* EF44F4 80241EE4 00000000 */ nop -.L80241EE8: -/* EF44F8 80241EE8 0280202D */ daddu $a0, $s4, $zero -/* EF44FC 80241EEC 02C0282D */ daddu $a1, $s6, $zero -/* EF4500 80241EF0 0C09034C */ jal EF2680_FlyingAI_ChaseInit -/* EF4504 80241EF4 02A0302D */ daddu $a2, $s5, $zero -.L80241EF8: -/* EF4508 80241EF8 0280202D */ daddu $a0, $s4, $zero -/* EF450C 80241EFC 02C0282D */ daddu $a1, $s6, $zero -/* EF4510 80241F00 0C090399 */ jal EF2680_FlyingAI_Chase -/* EF4514 80241F04 02A0302D */ daddu $a2, $s5, $zero -/* EF4518 80241F08 080907C7 */ j .L80241F1C -/* EF451C 80241F0C 00000000 */ nop -.L80241F10: -/* EF4520 80241F10 02C0282D */ daddu $a1, $s6, $zero -/* EF4524 80241F14 0C0903B2 */ jal EF2680_FlyingAI_LosePlayer -/* EF4528 80241F18 02A0302D */ daddu $a2, $s5, $zero -.L80241F1C: -/* EF452C 80241F1C 8E830070 */ lw $v1, 0x70($s4) -/* EF4530 80241F20 2410001F */ addiu $s0, $zero, 0x1f -.L80241F24: -/* EF4534 80241F24 1070001B */ beq $v1, $s0, .L80241F94 -/* EF4538 80241F28 28620020 */ slti $v0, $v1, 0x20 -/* EF453C 80241F2C 10400005 */ beqz $v0, .L80241F44 -/* EF4540 80241F30 2402001E */ addiu $v0, $zero, 0x1e -/* EF4544 80241F34 1062000A */ beq $v1, $v0, .L80241F60 -/* EF4548 80241F38 00000000 */ nop -/* EF454C 80241F3C 08090804 */ j .L80242010 -/* EF4550 80241F40 00000000 */ nop -.L80241F44: -/* EF4554 80241F44 24020020 */ addiu $v0, $zero, 0x20 -/* EF4558 80241F48 10620022 */ beq $v1, $v0, .L80241FD4 -/* EF455C 80241F4C 24020021 */ addiu $v0, $zero, 0x21 -/* EF4560 80241F50 10620029 */ beq $v1, $v0, .L80241FF8 -/* EF4564 80241F54 00000000 */ nop -/* EF4568 80241F58 08090804 */ j .L80242010 -/* EF456C 80241F5C 00000000 */ nop -.L80241F60: -/* EF4570 80241F60 9642008E */ lhu $v0, 0x8e($s2) -/* EF4574 80241F64 2442FFFF */ addiu $v0, $v0, -1 -/* EF4578 80241F68 A642008E */ sh $v0, 0x8e($s2) -/* EF457C 80241F6C 00021400 */ sll $v0, $v0, 0x10 -/* EF4580 80241F70 1C400027 */ bgtz $v0, .L80242010 -/* EF4584 80241F74 00000000 */ nop -/* EF4588 80241F78 0C010ABD */ jal dead_get_enemy -/* EF458C 80241F7C 8E64007C */ lw $a0, 0x7c($s3) -/* EF4590 80241F80 24030002 */ addiu $v1, $zero, 2 -/* EF4594 80241F84 AC430094 */ sw $v1, 0x94($v0) -/* EF4598 80241F88 24020005 */ addiu $v0, $zero, 5 -/* EF459C 80241F8C A642008E */ sh $v0, 0x8e($s2) -/* EF45A0 80241F90 AE900070 */ sw $s0, 0x70($s4) -.L80241F94: -/* EF45A4 80241F94 9642008E */ lhu $v0, 0x8e($s2) -/* EF45A8 80241F98 2442FFFF */ addiu $v0, $v0, -1 -/* EF45AC 80241F9C A642008E */ sh $v0, 0x8e($s2) -/* EF45B0 80241FA0 00021400 */ sll $v0, $v0, 0x10 -/* EF45B4 80241FA4 1C40001A */ bgtz $v0, .L80242010 -/* EF45B8 80241FA8 3C020049 */ lui $v0, 0x49 -/* EF45BC 80241FAC 34420015 */ ori $v0, $v0, 0x15 -/* EF45C0 80241FB0 AE420028 */ sw $v0, 0x28($s2) -/* EF45C4 80241FB4 0C010ABD */ jal dead_get_enemy -/* EF45C8 80241FB8 8E64007C */ lw $a0, 0x7c($s3) -/* EF45CC 80241FBC 24030003 */ addiu $v1, $zero, 3 -/* EF45D0 80241FC0 AC430094 */ sw $v1, 0x94($v0) -/* EF45D4 80241FC4 2402000A */ addiu $v0, $zero, 0xa -/* EF45D8 80241FC8 A642008E */ sh $v0, 0x8e($s2) -/* EF45DC 80241FCC 24020020 */ addiu $v0, $zero, 0x20 -/* EF45E0 80241FD0 AE820070 */ sw $v0, 0x70($s4) -.L80241FD4: -/* EF45E4 80241FD4 9642008E */ lhu $v0, 0x8e($s2) -/* EF45E8 80241FD8 2442FFFF */ addiu $v0, $v0, -1 -/* EF45EC 80241FDC A642008E */ sh $v0, 0x8e($s2) -/* EF45F0 80241FE0 00021400 */ sll $v0, $v0, 0x10 -/* EF45F4 80241FE4 1C40000A */ bgtz $v0, .L80242010 -/* EF45F8 80241FE8 24020003 */ addiu $v0, $zero, 3 -/* EF45FC 80241FEC A642008E */ sh $v0, 0x8e($s2) -/* EF4600 80241FF0 24020021 */ addiu $v0, $zero, 0x21 -/* EF4604 80241FF4 AE820070 */ sw $v0, 0x70($s4) -.L80241FF8: -/* EF4608 80241FF8 9642008E */ lhu $v0, 0x8e($s2) -/* EF460C 80241FFC 2442FFFF */ addiu $v0, $v0, -1 -/* EF4610 80242000 A642008E */ sh $v0, 0x8e($s2) -/* EF4614 80242004 00021400 */ sll $v0, $v0, 0x10 -/* EF4618 80242008 58400001 */ blezl $v0, .L80242010 -/* EF461C 8024200C AE800070 */ sw $zero, 0x70($s4) -.L80242010: -/* EF4620 80242010 8E820070 */ lw $v0, 0x70($s4) -/* EF4624 80242014 2442FFE2 */ addiu $v0, $v0, -0x1e -/* EF4628 80242018 2C420002 */ sltiu $v0, $v0, 2 -/* EF462C 8024201C 10400054 */ beqz $v0, .L80242170 -/* EF4630 80242020 0000102D */ daddu $v0, $zero, $zero -/* EF4634 80242024 3C108010 */ lui $s0, %hi(dead_gPlayerStatusPtr) -/* EF4638 80242028 2610FC90 */ addiu $s0, $s0, %lo(dead_gPlayerStatusPtr) -/* EF463C 8024202C C64C0038 */ lwc1 $f12, 0x38($s2) -/* EF4640 80242030 8E020000 */ lw $v0, ($s0) -/* EF4644 80242034 C64E0040 */ lwc1 $f14, 0x40($s2) -/* EF4648 80242038 8C460028 */ lw $a2, 0x28($v0) -/* EF464C 8024203C 0C00ABDC */ jal fio_validate_header_checksums -/* EF4650 80242040 8C470030 */ lw $a3, 0x30($v0) -/* EF4654 80242044 8E460038 */ lw $a2, 0x38($s2) -/* EF4658 80242048 8E470040 */ lw $a3, 0x40($s2) -/* EF465C 8024204C 8E020000 */ lw $v0, ($s0) -/* EF4660 80242050 E640000C */ swc1 $f0, 0xc($s2) -/* EF4664 80242054 C44C0028 */ lwc1 $f12, 0x28($v0) -/* EF4668 80242058 0C00AC71 */ jal dead_dist2D -/* EF466C 8024205C C44E0030 */ lwc1 $f14, 0x30($v0) -/* EF4670 80242060 C6A20008 */ lwc1 $f2, 8($s5) -/* EF4674 80242064 468010A0 */ cvt.s.w $f2, $f2 -/* EF4678 80242068 44051000 */ mfc1 $a1, $f2 -/* EF467C 8024206C C6A2000C */ lwc1 $f2, 0xc($s5) -/* EF4680 80242070 468010A0 */ cvt.s.w $f2, $f2 -/* EF4684 80242074 44061000 */ mfc1 $a2, $f2 -/* EF4688 80242078 C6420040 */ lwc1 $f2, 0x40($s2) -/* EF468C 8024207C E7A20010 */ swc1 $f2, 0x10($sp) -/* EF4690 80242080 C6A20010 */ lwc1 $f2, 0x10($s5) -/* EF4694 80242084 468010A0 */ cvt.s.w $f2, $f2 -/* EF4698 80242088 E7A20014 */ swc1 $f2, 0x14($sp) -/* EF469C 8024208C C6A20014 */ lwc1 $f2, 0x14($s5) -/* EF46A0 80242090 468010A0 */ cvt.s.w $f2, $f2 -/* EF46A4 80242094 E7A20018 */ swc1 $f2, 0x18($sp) -/* EF46A8 80242098 8EA40004 */ lw $a0, 4($s5) -/* EF46AC 8024209C 8E470038 */ lw $a3, 0x38($s2) -/* EF46B0 802420A0 0C013431 */ jal dead_is_point_within_region -/* EF46B4 802420A4 46000506 */ mov.s $f20, $f0 -/* EF46B8 802420A8 14400031 */ bnez $v0, .L80242170 -/* EF46BC 802420AC 0000102D */ daddu $v0, $zero, $zero -/* EF46C0 802420B0 3C01403E */ lui $at, 0x403e -/* EF46C4 802420B4 44810800 */ mtc1 $at, $f1 -/* EF46C8 802420B8 44800000 */ mtc1 $zero, $f0 -/* EF46CC 802420BC 4600A0A1 */ cvt.d.s $f2, $f20 -/* EF46D0 802420C0 4622003C */ c.lt.d $f0, $f2 -/* EF46D4 802420C4 00000000 */ nop -/* EF46D8 802420C8 45000029 */ bc1f .L80242170 -/* EF46DC 802420CC 00000000 */ nop -/* EF46E0 802420D0 8642008C */ lh $v0, 0x8c($s2) -/* EF46E4 802420D4 54400026 */ bnel $v0, $zero, .L80242170 -/* EF46E8 802420D8 0000102D */ daddu $v0, $zero, $zero -/* EF46EC 802420DC 3C014034 */ lui $at, 0x4034 -/* EF46F0 802420E0 44810800 */ mtc1 $at, $f1 -/* EF46F4 802420E4 44800000 */ mtc1 $zero, $f0 -/* EF46F8 802420E8 00000000 */ nop -/* EF46FC 802420EC 46201001 */ sub.d $f0, $f2, $f0 -/* EF4700 802420F0 44801000 */ mtc1 $zero, $f2 -/* EF4704 802420F4 44801800 */ mtc1 $zero, $f3 -/* EF4708 802420F8 46200120 */ cvt.s.d $f4, $f0 -/* EF470C 802420FC 46002021 */ cvt.d.s $f0, $f4 -/* EF4710 80242100 4622003C */ c.lt.d $f0, $f2 -/* EF4714 80242104 00000000 */ nop -/* EF4718 80242108 45000002 */ bc1f .L80242114 -/* EF471C 8024210C 00000000 */ nop -/* EF4720 80242110 44802000 */ mtc1 $zero, $f4 -.L80242114: -/* EF4724 80242114 3C014069 */ lui $at, 0x4069 -/* EF4728 80242118 44811800 */ mtc1 $at, $f3 -/* EF472C 8024211C 44801000 */ mtc1 $zero, $f2 -/* EF4730 80242120 46002021 */ cvt.d.s $f0, $f4 -/* EF4734 80242124 4620103C */ c.lt.d $f2, $f0 -/* EF4738 80242128 00000000 */ nop -/* EF473C 8024212C 45000003 */ bc1f .L8024213C -/* EF4740 80242130 240200C8 */ addiu $v0, $zero, 0xc8 -/* EF4744 80242134 3C014348 */ lui $at, 0x4348 -/* EF4748 80242138 44812000 */ mtc1 $at, $f4 -.L8024213C: -/* EF474C 8024213C AFA20010 */ sw $v0, 0x10($sp) -/* EF4750 80242140 8EC50000 */ lw $a1, ($s6) -/* EF4754 80242144 8EC60018 */ lw $a2, 0x18($s6) -/* EF4758 80242148 4600218D */ trunc.w.s $f6, $f4 -/* EF475C 8024214C 44073000 */ mfc1 $a3, $f6 -/* EF4760 80242150 0C00ADA9 */ jal dead_update_lerp -/* EF4764 80242154 0000202D */ daddu $a0, $zero, $zero -/* EF4768 80242158 44050000 */ mfc1 $a1, $f0 -/* EF476C 8024215C 8E46000C */ lw $a2, 0xc($s2) -/* EF4770 80242160 0240202D */ daddu $a0, $s2, $zero -/* EF4774 80242164 0C00F909 */ jal dead_npc_move_heading -/* EF4778 80242168 AC850018 */ sw $a1, 0x18($a0) -/* EF477C 8024216C 0000102D */ daddu $v0, $zero, $zero -.L80242170: -/* EF4780 80242170 8FBF005C */ lw $ra, 0x5c($sp) -/* EF4784 80242174 8FB60058 */ lw $s6, 0x58($sp) -/* EF4788 80242178 8FB50054 */ lw $s5, 0x54($sp) -/* EF478C 8024217C 8FB40050 */ lw $s4, 0x50($sp) -/* EF4790 80242180 8FB3004C */ lw $s3, 0x4c($sp) -/* EF4794 80242184 8FB20048 */ lw $s2, 0x48($sp) -/* EF4798 80242188 8FB10044 */ lw $s1, 0x44($sp) -/* EF479C 8024218C 8FB00040 */ lw $s0, 0x40($sp) -/* EF47A0 80242190 D7B40060 */ ldc1 $f20, 0x60($sp) -/* EF47A4 80242194 03E00008 */ jr $ra -/* EF47A8 80242198 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 3135c6bc98..6318969a2e 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -890,7 +890,8 @@ segments: - [0x1164B8, ci8, peach_letter, 150, 105] - [0x11A240, palette, peach_letter] - [0x11A440, bin] - - type: code + - name: ui_images + type: code start: 0x131340 vram: 0x8023E000 subsegments: diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 2acd5a877d..bb517bba99 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -6231,6 +6231,7 @@ D_80249D60 = 0x80249D60; // type:data rom:0x16A5C0 D_80249D70 = 0x80249D70; // type:data rom:0x16A5D0 D_80249DAC = 0x80249DAC; // type:data rom:0x16A60C D_80249DCC = 0x80249DCC; // type:data rom:0x16A62C +D_80249DD0 = 0x80249DD0; // type:data rom:0x16A630 get_dpad_input_radial = 0x8023E000; // type:func rom:0x16C8E0 filemenu_pressedButtons = 0x8024C084; // type:data rom:0x16C8E4 filemenu_8024C088 = 0x8024C088; // type:data rom:0x16C8E8 @@ -7574,6 +7575,7 @@ snowflake_init = 0xE001C120; // type:func rom:0x330A30 snowflake_update = 0xE001C128; // type:func rom:0x330A38 snowflake_render = 0xE001C200; // type:func rom:0x330B10 snowflake_appendGfx = 0xE001C30C; // type:func rom:0x330C1C +D_E001C5E0 = 0xE001C5E0; // type:data rom:0x330EF0 star_main = 0xE001E000; // type:func rom:0x331940 star_init = 0xE001E370; // type:func rom:0x331CB0 star_update = 0xE001E378; // type:func rom:0x331CB8 @@ -7963,6 +7965,7 @@ balloon_init = 0xE00960EC; // type:func rom:0x39436C balloon_update = 0xE00960F4; // type:func rom:0x394374 balloon_render = 0xE0096178; // type:func rom:0x3943F8 balloon_appendGfx = 0xE00961BC; // type:func rom:0x39443C +D_E00963E0 = 0xE00963E0; // type:data rom:0x394660 floating_rock_main = 0xE0098000; // type:func rom:0x395BB0 floating_rock_init = 0xE0098168; // type:func rom:0x395D18 floating_rock_update = 0xE0098170; // type:func rom:0x395D20 @@ -8452,18 +8455,18 @@ action_command_hammer_free_hud_elements = 0x802A9A30; // type:func rom:0x422A30 func_802A9000_422AD0 = 0x802A9000; // type:func rom:0x422AD0 func_802A92A0_422D70 = 0x802A92A0; // type:func rom:0x422D70 func_802A9378_422E48 = 0x802A9378; // type:func rom:0x422E48 -func_802A96F4_4231C4 = 0x802A96F4; // type:func rom:0x4231C4 -func_802A9894_423364 = 0x802A9894; // type:func rom:0x423364 +action_command_flee_draw_hud_elements = 0x802A96F4; // type:func rom:0x4231C4 +action_command_flee_free_hud_elements = 0x802A9894; // type:func rom:0x423364 func_802A9000_4233F0 = 0x802A9000; // type:func rom:0x4233F0 func_802A91B0_4235A0 = 0x802A91B0; // type:func rom:0x4235A0 func_802A92DC_4236CC = 0x802A92DC; // type:func rom:0x4236CC -func_802A96B8_423AA8 = 0x802A96B8; // type:func rom:0x423AA8 -func_802A97FC_423BEC = 0x802A97FC; // type:func rom:0x423BEC +action_command_break_free_draw_hud_elements = 0x802A96B8; // type:func rom:0x423AA8 +action_command_break_free_free_hud_elements = 0x802A97FC; // type:func rom:0x423BEC func_802A9000_423C70 = 0x802A9000; // type:func rom:0x423C70 func_802A91E0_423E50 = 0x802A91E0; // type:func rom:0x423E50 func_802A92F0_423F60 = 0x802A92F0; // type:func rom:0x423F60 -func_802A9744_4243B4 = 0x802A9744; // type:func rom:0x4243B4 -func_802A9898_424508 = 0x802A9898; // type:func rom:0x424508 +action_command_whirlwind_draw_hud_elements = 0x802A9744; // type:func rom:0x4243B4 +action_command_whirlwind_free_hud_elements = 0x802A9898; // type:func rom:0x424508 battle_action_cmd_whirlwind_1_png = 0x802A98E0; // type:data rom:0x424550 battle_action_cmd_whirlwind_1_pal = 0x802A9A00; // type:data rom:0x424670 battle_action_cmd_whirlwind_2_png = 0x802A9A20; // type:data rom:0x424690 @@ -8497,24 +8500,24 @@ D_802AA8B7_425527 = 0x802AA8B7; // type:data rom:0x425527 func_802A9000_425590 = 0x802A9000; // type:func rom:0x425590 func_802A9110_4256A0 = 0x802A9110; // type:func rom:0x4256A0 func_802A91F8_425788 = 0x802A91F8; // type:func rom:0x425788 -func_802A94A4_425A34 = 0x802A94A4; // type:func rom:0x425A34 -func_802A9544_425AD4 = 0x802A9544; // type:func rom:0x425AD4 +action_command_stop_leech_draw_hud_elements = 0x802A94A4; // type:func rom:0x425A34 +action_command_stop_leech_free_hud_elements = 0x802A9544; // type:func rom:0x425AD4 func_802A9000_425B50 = 0x802A9000; // type:func rom:0x425B50 func_802A916C_425CBC = 0x802A916C; // type:func rom:0x425CBC func_802A9228_425D78 = 0x802A9228; // type:func rom:0x425D78 -func_802A94D8_426028 = 0x802A94D8; // type:func rom:0x426028 +action_command_07_draw_hud_elements = 0x802A94D8; // type:func rom:0x426028 action_command_07_free_hud_elements = 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 -action_command_dizzy_shell_UnkActionCommandFunc1 = 0x802A96DC; // type:func rom:0x42684C +action_command_dizzy_shell_draw_hud_elements = 0x802A96DC; // type:func rom:0x42684C action_command_dizzy_shell_free_hud_elements = 0x802A97BC; // type:func rom:0x42692C D_802A9800_426970 = 0x802A9800; // type:data rom:0x426970 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 -action_command_fire_shell_UnkActionCommandFunc1 = 0x802A9834; // type:func rom:0x427204 +action_command_fire_shell_draw_hud_elements = 0x802A9834; // type:func rom:0x427204 action_command_fire_shell_free_hud_elements = 0x802A9914; // type:func rom:0x4272E4 D_802A9950_427320 = 0x802A9950; // type:data rom:0x427320 D_802A9952_427322 = 0x802A9952; // type:data rom:0x427322 @@ -8524,12 +8527,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 -action_command_0A_UnkActionCommandFunc1 = 0x802A955C; // type:func rom:0x42790C +action_command_0A_draw_hud_elements = 0x802A955C; // type:func rom:0x42790C action_command_0A_free_hud_elements = 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 -action_command_bomb_UnkActionCommandFunc1 = 0x802A96EC; // type:func rom:0x42815C +action_command_bomb_draw_hud_elements = 0x802A96EC; // type:func rom:0x42815C action_command_bomb_free_hud_elements = 0x802A97CC; // type:func rom:0x42823C D_802A9810_428280 = 0x802A9810; // type:data rom:0x428280 D_802A9812_428282 = 0x802A9812; // type:data rom:0x428282 @@ -8541,7 +8544,7 @@ action_command_body_slam_free_hud_elements = 0x802A9708; // type:func rom:0x4289 func_802A9000_428A70 = 0x802A9000; // type:func rom:0x428A70 func_802A9184_428BF4 = 0x802A9184; // type:func rom:0x428BF4 func_802A9278_428CE8 = 0x802A9278; // type:func rom:0x428CE8 -func_802A96EC_42915C = 0x802A96EC; // type:func rom:0x42915C +action_command_air_lift_draw_hud_elements = 0x802A96EC; // type:func rom:0x42915C action_command_air_lift_free_hud_elements = 0x802A9810; // type:func rom:0x429280 D_802A9852_4292C0 = 0x802A9850; // type:data rom:0x4292C0 D_802A9852_4292C2 = 0x802A9852; // type:data rom:0x4292C2 @@ -8549,7 +8552,7 @@ air_lift_bss_pre = 0x802A98A8; // type:data rom:0x429318 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 -action_command_air_raid_UnkActionCommandFunc1 = 0x802A984C; // type:func rom:0x429B6C +action_command_air_raid_draw_hud_elements = 0x802A984C; // type:func rom:0x429B6C action_command_air_raid_free_hud_elements = 0x802A992C; // type:func rom:0x429C4C D_802A9970_429C90 = 0x802A9970; // type:data rom:0x429C90 D_802A9972_429C92 = 0x802A9972; // type:data rom:0x429C92 @@ -8559,16 +8562,16 @@ D_802A99A8_429CC8 = 0x802A99A8; // type:data rom:0x429CC8 func_802A9000_429D20 = 0x802A9000; // type:func rom:0x429D20 func_802A911C_429E3C = 0x802A911C; // type:func rom:0x429E3C func_802A9208_429F28 = 0x802A9208; // type:func rom:0x429F28 -func_802A9634_42A354 = 0x802A9634; // type:func rom:0x42A354 -func_802A9720_42A440 = 0x802A9720; // type:func rom:0x42A440 +action_command_squirt_draw_hud_elements = 0x802A9634; // type:func rom:0x42A354 +action_command_squirt_free_hud_elements = 0x802A9720; // type:func rom:0x42A440 D_802A9760_42A480 = 0x802A9760; // type:data rom:0x42A480 D_802A9762_42A482 = 0x802A9762; // type:data rom:0x42A482 D_802A9778_42A498 = 0x802A9778; // type:data rom:0x42A498 func_802A9000_42A4F0 = 0x802A9000; // type:func rom:0x42A4F0 func_802A9398_42A888 = 0x802A9398; // type:func rom:0x42A888 func_802A948C_42A97C = 0x802A948C; // type:func rom:0x42A97C -func_802AA014_42B504 = 0x802AA014; // type:func rom:0x42B504 -func_802AA0D8_42B5C8 = 0x802AA0D8; // type:func rom:0x42B5C8 +action_command_water_block_draw_hud_elements = 0x802AA014; // type:func rom:0x42B504 +action_command_water_block_free_hud_elements = 0x802AA0D8; // type:func rom:0x42B5C8 battle_action_cmd_water_block_1_png = 0x802AA160; // type:data rom:0x42B650 battle_action_cmd_water_block_1_pal = 0x802AA280; // type:data rom:0x42B770 battle_action_cmd_water_block_2_png = 0x802AA2A0; // type:data rom:0x42B790 @@ -8612,14 +8615,14 @@ D_802A9AA2_42D9B2 = 0x802A9AA2; // type:data rom:0x42D9B2 func_802A9000_42DA10 = 0x802A9000; // type:func rom:0x42DA10 func_802A91A0_42DBB0 = 0x802A91A0; // type:func rom:0x42DBB0 func_802A92A0_42DCB0 = 0x802A92A0; // type:func rom:0x42DCB0 -func_802A97F8_42E208 = 0x802A97F8; // type:func rom:0x42E208 -func_802A98E0_42E2F0 = 0x802A98E0; // type:func rom:0x42E2F0 +action_command_mega_shock_draw_hud_elements = 0x802A97F8; // type:func rom:0x42E208 +action_command_mega_shock_free_hud_elements = 0x802A98E0; // type:func rom:0x42E2F0 D_802A9930_42E340 = 0x802A9930; // type:data rom:0x42E340 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 -action_command_smack_UnkActionCommandFunc1 = 0x802A98B0; // type:func rom:0x42EC50 +action_command_smack_draw_hud_elements = 0x802A98B0; // type:func rom:0x42EC50 action_command_smack_free_hud_elements = 0x802A9990; // type:func rom:0x42ED30 D_802A99D2_42ED72 = 0x802A99D2; // type:data rom:0x42ED70 D_802A99E4_42ED84 = 0x802A99E4; // type:data rom:0x42ED84 @@ -8629,21 +8632,21 @@ 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 -action_command_spiny_surge_UnkActionCommandFunc1 = 0x802A973C; // type:func rom:0x42F55C +action_command_spiny_surge_draw_hud_elements = 0x802A973C; // type:func rom:0x42F55C action_command_spiny_surge_free_hud_elements = 0x802A981C; // type:func rom:0x42F63C D_802A9860_42F680 = 0x802A9860; // type:data rom:0x42F680 D_802A9862_42F682 = 0x802A9862; // type:data rom:0x42F682 func_802A9000_42F6E0 = 0x802A9000; // type:func rom:0x42F6E0 func_802A91A0_42F880 = 0x802A91A0; // type:func rom:0x42F880 func_802A92A0_42F980 = 0x802A92A0; // type:func rom:0x42F980 -func_802A97AC_42FE8C = 0x802A97AC; // type:func rom:0x42FE8C -func_802A9894_42FF74 = 0x802A9894; // type:func rom:0x42FF74 +action_command_hurricane_draw_hud_elements = 0x802A97AC; // type:func rom:0x42FE8C +action_command_hurricane_free_hud_elements = 0x802A9894; // type:func rom:0x42FF74 D_802A98E0_42FFC0 = 0x802A98E0; // type:data rom:0x42FFC0 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 -action_command_spook_UnkActionCommandFunc1 = 0x802A97FC; // type:func rom:0x43081C +action_command_spook_draw_hud_elements = 0x802A97FC; // type:func rom:0x43081C action_command_spook_free_hud_elements = 0x802A98DC; // type:func rom:0x4308FC D_802A9920_430940 = 0x802A9920; // type:data rom:0x430940 D_802A9922_430942 = 0x802A9922; // type:data rom:0x430942 @@ -11807,18 +11810,18 @@ func_80219960_5EDDF0 = 0x80219960; // type:func rom:0x5EDDF0 b_area_tik_UpdateTexturePanSmooth = 0x80219DB0; // type:func rom:0x5EE240 b_area_tik_UpdateTexturePanStepped = 0x80219ED4; // type:func rom:0x5EE364 b_area_tik2_StartRumbleWithParams = 0x80218000; // type:func rom:0x608AB0 -func_80218058_608B08 = 0x80218058; // type:func rom:0x608B08 +b_area_tik2_UnkWaterFountainFunc = 0x80218058; // type:func rom:0x608B08 dup_b_area_tik2_StartRumbleWithParams = 0x80218200; // type:func rom:0x608CB0 func_80218258_608D08 = 0x80218258; // type:func rom:0x608D08 b_area_tik2_FadeBackgroundToBlack = 0x802182EC; // type:func rom:0x608D9C b_area_tik2_UnfadeBackgroundToBlack = 0x80218384; // type:func rom:0x608E34 func_80218404_608EB4 = 0x80218404; // type:func rom:0x608EB4 -func_802184E4_608F94 = 0x802184E4; // type:func rom:0x608F94 +dup_b_area_tik2_UnkWaterFountainFunc = 0x802184E4; // type:func rom:0x608F94 dup2_b_area_tik2_StartRumbleWithParams = 0x80218680; // type:func rom:0x609130 func_802186D8_609188 = 0x802186D8; // type:func rom:0x609188 dup_b_area_tik2_FadeBackgroundToBlack = 0x8021876C; // type:func rom:0x60921C dup_b_area_tik2_UnfadeBackgroundToBlack = 0x80218804; // type:func rom:0x6092B4 -func_80218884_609334 = 0x80218884; // type:func rom:0x609334 +dup2_b_area_tik2_UnkWaterFountainFunc = 0x80218884; // type:func rom:0x609334 dup3_b_area_tik2_StartRumbleWithParams = 0x80218A20; // type:func rom:0x6094D0 b_area_tik2_UnkBattleFunc2 = 0x80218A78; // type:func rom:0x609528 b_area_tik2_UnkBattleFunc2_2 = 0x80218B2C; // type:func rom:0x6095DC @@ -14400,7 +14403,7 @@ func_802427B0_8B2820 = 0x802427B0; // type:func rom:0x8B2820 func_802427CC_8B283C = 0x802427CC; // type:func rom:0x8B283C func_802427EC_8B285C = 0x802427EC; // type:func rom:0x8B285C func_8024280C_8B287C = 0x8024280C; // type:func rom:0x8B287C -func_80242860_8B28D0 = 0x80242860; // type:func rom:0x8B28D0 +kmr_02_UnkNpcPosFunc = 0x80242860; // type:func rom:0x8B28D0 kmr_02_SyncStatusMenu = 0x8024293C; // type:func rom:0x8B29AC func_8024295C_8B29CC = 0x8024295C; // type:func rom:0x8B29CC btl_state_draw_switch_to_player_8B2C18 = 0x80242BA8; // type:func rom:0x8B2C18 @@ -14597,7 +14600,7 @@ kmr_11_StationaryAI_LosePlayer = 0x80240868; // type:func rom:0x8DA968 kmr_11_StationaryAI_ReturnHomeInit = 0x802408B0; // type:func rom:0x8DA9B0 kmr_11_StationaryAI_ReturnHome = 0x8024095C; // type:func rom:0x8DAA5C kmr_11_StationaryAI_Main = 0x80240B64; // type:func rom:0x8DAC64 -func_80240DDC_8DAEDC = 0x80240DDC; // type:func rom:0x8DAEDC +kmr_11_UnkNpcPosFunc = 0x80240DDC; // type:func rom:0x8DAEDC func_80240EC0_8DAFC0 = 0x80240EC0; // type:func rom:0x8DAFC0 dup_kmr_11_foliage_setup_shear_mtx = 0x80240F20; // type:func rom:0x8DB020 dup_kmr_11_TransformFoliage = 0x80240F90; // type:func rom:0x8DB090 @@ -18261,7 +18264,7 @@ D_80244154_BC12F4 = 0x80244154; // type:data rom:0xBC12F4 D_80244158_BC12F8 = 0x80244158; // type:data rom:0xBC12F8 D_80244A54_BC1BF4 = 0x80244A54; // type:data rom:0xBC1BF4 func_80240000_BC2A90 = 0x80240000; // type:func rom:0xBC2A90 -func_8024000C_BC2A9C = 0x8024000C; // type:func rom:0xBC2A9C +obk_02_UnkAngleFunc004 = 0x8024000C; // type:func rom:0xBC2A9C func_80240194_BC2C24 = 0x80240194; // type:func rom:0xBC2C24 func_80240240_BC2CD0 = 0x80240240; // type:func rom:0xBC2CD0 D_80240CBC_BC374C = 0x80240CBC; // type:data rom:0xBC374C @@ -18317,7 +18320,7 @@ obk_07_GetItemName = 0x802400B4; // type:func rom:0xBCECA4 obk_07_SomeItemEntityFunc = 0x80240118; // type:func rom:0xBCED08 obk_07_CheckItemFlags40 = 0x80240268; // type:func rom:0xBCEE58 func_802402C0_BCEEB0 = 0x802402C0; // type:func rom:0xBCEEB0 -func_802402CC_BCEEBC = 0x802402CC; // type:func rom:0xBCEEBC +obk_07_UnkAngleFunc004 = 0x802402CC; // type:func rom:0xBCEEBC func_80240454_BCF044 = 0x80240454; // type:func rom:0xBCF044 func_80240500_BCF0F0 = 0x80240500; // type:func rom:0xBCF0F0 func_80240540_BCF130 = 0x80240540; // type:func rom:0xBCF130 @@ -22933,7 +22936,7 @@ omo_04_ShyGuyWanderAI_17 = 0x80241A70; // type:func rom:0xDAEE70 omo_04_ShyGuyWanderAI_Main = 0x80241AD0; // type:func rom:0xDAEED0 omo_04_SetCamera0Flag1000 = 0x80241E04; // type:func rom:0xDAF204 omo_04_UnsetCamera0Flag1000 = 0x80241E20; // type:func rom:0xDAF220 -func_80241E40_DAF240 = 0x80241E40; // type:func rom:0xDAF240 +omo_04_UnkNpcPosFunc = 0x80241E40; // type:func rom:0xDAF240 omo_04_varStash = 0x80242630; // type:data rom:0xDAFA30 omo_04_FlyingAI_JumpVels = 0x80242EF0; // type:data rom:0xDB02F0 D_80244CB0_DB20B0 = 0x80244CB0; // type:data rom:0xDB20B0 @@ -23037,7 +23040,7 @@ omo_07_SomeItemEntityFunc = 0x80243038; // type:func rom:0xDC02E8 omo_07_CheckItemFlags40 = 0x80243188; // type:func rom:0xDC0438 omo_07_UnsetCamera0MoveFlag1 = 0x802431DC; // type:func rom:0xDC048C omo_07_SetCamera0MoveFlag1 = 0x802431F8; // type:func rom:0xDC04A8 -func_80243220_DC04D0 = 0x80243220; // type:func rom:0xDC04D0 +omo_07_UnkNpcPosFunc = 0x80243220; // type:func rom:0xDC04D0 omo_07_FlyingAI_JumpVels = 0x80243A14; // type:data rom:0xDC0CC4 omo_07_varStash = 0x80245E00; // type:data rom:0xDC30B0 D_80246BD0_DC3E80 = 0x80246BD0; // type:data rom:0xDC3E80 @@ -23112,7 +23115,7 @@ omo_09_GetEncounterEnemyIsOwner = 0x80243580; // type:func rom:0xDD0250 dup_omo_09_SetNpcB5_3 = 0x802435B8; // type:func rom:0xDD0288 omo_09_SetCamera0Flag1000 = 0x802435CC; // type:func rom:0xDD029C omo_09_UnsetCamera0Flag1000 = 0x802435E8; // type:func rom:0xDD02B8 -func_80243610_DD02E0 = 0x80243610; // type:func rom:0xDD02E0 +omo_09_UnkNpcPosFunc = 0x80243610; // type:func rom:0xDD02E0 D_80243A80_DD0750 = 0x80243A80; // type:data rom:0xDD0750 D_80243A90_DD0760 = 0x80243A90; // type:data rom:0xDD0760 D_802451AC_DD1E7C = 0x802451AC; // type:data rom:0xDD1E7C @@ -23950,12 +23953,12 @@ ED42A0_varStash = 0x80241DA0; // type:data rom:0xED5FC0 D_80244160_ED8380 = 0x80244160; // type:data rom:0xED8380 D_80244BB8_ED8DD8 = 0x80244BB8; // type:data rom:0xED8DD8 D_80244BEC_ED8E0C = 0x80244BEC; // type:data rom:0xED8E0C -ED8E20_DeadPipe_SetAnimFlag = 0x80240000; // type:func rom:0xED8E20 -ED8E20_DeadPipe_GetCurrentFloor = 0x80240020; // type:func rom:0xED8E40 -ED8E20_DeadPipe_AwaitDownInput = 0x80240034; // type:func rom:0xED8E54 -ED8E20_DeadPipe_GetEntryPos = 0x802400F0; // type:func rom:0xED8F10 -ED8E20_DeadPipe_GetCameraYaw = 0x80240208; // type:func rom:0xED9028 -ED8E20_DeadPipe_GetPointAheadOfPlayer = 0x80240274; // type:func rom:0xED9094 +ED8E20_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xED8E20 +ED8E20_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xED8E40 +ED8E20_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xED8E54 +ED8E20_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0xED8F10 +ED8E20_Pipe_GetCameraYaw = 0x80240208; // type:func rom:0xED9028 +ED8E20_Pipe_GetPointAheadOfPlayer = 0x80240274; // type:func rom:0xED9094 func_80240318_ED9138 = 0x80240318; // type:func rom:0xED9138 D_80243170_EDBF90 = 0x80243170; // type:data rom:0xEDBF90 func_80240000_EDBFE0 = 0x80240000; // type:func rom:0xEDBFE0 @@ -24108,10 +24111,10 @@ EF2680_FlyingAI_Chase = 0x80240E64; // type:func rom:0xEF3474 EF2680_FlyingAI_LosePlayer = 0x80240EC8; // type:func rom:0xEF34D8 EF2680_FlyingAI_Init = 0x80241258; // type:func rom:0xEF3868 EF2680_FlyingAI_Main = 0x8024137C; // type:func rom:0xEF398C -func_80241594_EF3BA4 = 0x80241594; // type:func rom:0xEF3BA4 -func_802415DC_EF3BEC = 0x802415DC; // type:func rom:0xEF3BEC -func_80241A40_EF4050 = 0x80241A40; // type:func rom:0xEF4050 -func_80241C90_EF42A0 = 0x80241C90; // type:func rom:0xEF42A0 +EF2680_LakituAI_GetAvailableSpiny = 0x80241594; // type:func rom:0xEF3BA4 +EF2680_LakituAI_Wander = 0x802415DC; // type:func rom:0xEF3BEC +EF2680_LakituAI_Loiter = 0x80241A40; // type:func rom:0xEF4050 +EF2680_LakituAI_Main = 0x80241C90; // type:func rom:0xEF42A0 EF2680_set_script_owner_npc_anim = 0x8024219C; // type:func rom:0xEF47AC EF2680_UnkDistFunc = 0x80242218; // type:func rom:0xEF4828 EF2680_UnkNpcAIFunc12 = 0x8024234C; // type:func rom:0xEF495C @@ -24313,6 +24316,7 @@ D_09002A38 = 0x9002A38; // type:data D_09002B20 = 0x9002B20; // type:data D_09002B40 = 0x9002B40; // type:data D_09002B60 = 0x9002B60; // type:data +D_09002D40 = 0x9002D40; // type:data D_09003540 = 0x9003540; // type:data D_09003580 = 0x9003580; // type:data D_090035C0 = 0x90035C0; // type:data @@ -24325,6 +24329,19 @@ D_09003740 = 0x9003740; // type:data D_09003780 = 0x9003780; // type:data D_090037C0 = 0x90037C0; // type:data D_09003800 = 0x9003800; // type:data +D_09003880 = 0x9003880; // type:data +D_090038F8 = 0x90038F8; // type:data +D_09003968 = 0x9003968; // type:data +D_090039D8 = 0x90039D8; // type:data +D_09003A48 = 0x9003A48; // type:data +D_09003AB8 = 0x9003AB8; // type:data +D_09003B28 = 0x9003B28; // type:data +D_09003B98 = 0x9003B98; // type:data +D_09003C08 = 0x9003C08; // type:data +D_09003C78 = 0x9003C78; // type:data +D_09003CE8 = 0x9003CE8; // type:data +D_09003D58 = 0x9003D58; // type:data +D_09003DC8 = 0x9003DC8; // type:data D_0A000328 = 0xA000328; // type:data D_0A000380 = 0xA000380; // type:data D_0A000740 = 0xA000740; // type:data @@ -24352,7 +24369,6 @@ D_8000030C = 0x8000030C; // type:data osMemSize = 0x80000318; // type:data D_8000031C = 0x8000031C; // type:data D_80026AC7 = 0x80026AC7; // type:data -dead_atan2 = 0x8002AF70; // type:data D_8004AA85 = 0x8004AA85; // type:data gcc2_compiled. = 0x80060D60; // type:data ai = 0x8006AD64; // @@ -24380,6 +24396,8 @@ D_80097D78 = 0x80097D78; // type:data D_80097D80 = 0x80097D80; // type:data D_80097D88 = 0x80097D88; // type:data pad = 0x80098474; // type:data +fchar.2 = 0x80099BF0; // type:data +fbit.3 = 0x80099BF8; // type:data nuScPreNMIFlag = 0x8009A5B0; // type:data D_8009BB30 = 0x8009BB30; // type:data D_8009C4E0 = 0x8009C4E0; // type:data @@ -24668,8 +24686,6 @@ D_80156903 = 0x80156903; // type:data D_8015690B = 0x8015690B; // type:data D_8015C7A8 = 0x8015C7A8; // type:data D_80164000 = 0x80164000; // type:data -dead_gCollisionStatus = 0x80169B12; // type:data -D_80169B16 = 0x80169B16; // type:data D_80197000 = 0x80197000; // type:data D_801A6000 = 0x801A6000; // type:data D_801A7000 = 0x801A7000; // type:data @@ -25693,9 +25709,6 @@ D_8029FBC0 = 0x8029FBC0; // type:data D_8029FBD0 = 0x8029FBD0; // type:data D_8029FBD4 = 0x8029FBD4; // type:data gActionCommandStatus = 0x8029FBE0; // type:data -D_8029FC2A = 0x8029FC2A; // type:data -D_8029FC3E = 0x8029FC3E; // type:data -D_8029FC4C = 0x8029FC4C; // type:data D_802A19B0 = 0x802A19B0; // type:data D_802A19C0 = 0x802A19C0; // type:data D_802A1A60 = 0x802A1A60; // type:data @@ -26202,7 +26215,6 @@ D_E0016738 = 0xE0016738; // type:data D_E0016740 = 0xE0016740; // type:data D_E001A620 = 0xE001A620; // type:data D_E001A628 = 0xE001A628; // type:data -D_E001C5E0 = 0xE001C5E0; // type:data D_E001ED50 = 0xE001ED50; // type:data D_E001ED58 = 0xE001ED58; // type:data D_E0022CD0 = 0xE0022CD0; // type:data @@ -26509,7 +26521,6 @@ D_E00947B0 = 0xE00947B0; // type:data D_E00947B8 = 0xE00947B8; // type:data D_E00947C0 = 0xE00947C0; // type:data D_E00947C8 = 0xE00947C8; // type:data -D_E00963E0 = 0xE00963E0; // type:data D_E0098510 = 0xE0098510; // type:data D_E0098530 = 0xE0098530; // type:data D_E009AA78 = 0xE009AA78; // type:data @@ -26806,7 +26817,6 @@ D_F5000007 = 0xF5000007; // type:data D_F79DDD0F = 0xF79DDD0F; // type:data D_FA000028 = 0xFA000028; // type:data D_FD100008 = 0xFD100008; // type:data -dead_atan2 = 0x8002AF70; // type:data dead:yes dead_atan2 = 0x8002AF70; // type:func dead:yes dead_cos_rad = 0x8002B4C0; // type:func dead:yes dead_heap_free = 0x8002C01C; // type:data dead:yes @@ -26831,7 +26841,7 @@ dead_gPartnerActionStatus = 0x80117160; // type:data dead:yes dead_gPlayerStatus = 0x80117578; // type:data dead:yes dead_gPlayerActionState = 0x8011762C; // type:data dead:yes dead_gPlayerData = 0x80117840; // type:data dead:yes -dead_gCollisionStatus = 0x80169B12; // type:data dead:yes +dead_gCollisionStatus = 0x80169B10; // type:data dead:yes dead_evt_get_variable = 0x802D4E8C; // type:func dead:yes dead_evt_set_variable = 0x802D5468; // type:func dead:yes dead_evt_get_float_variable = 0x802D57FC; // type:func dead:yes diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index cf7c6c0b52..3c29a8552d 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -370,7 +370,7 @@ dead_decrement_status_menu_disabled = 0x800F16F4; dead_get_model_list_index_from_tree_index = 0x80125270; dead_get_model_from_list_index = 0x80124F44; dead_guTranslateF = 0x8006CAC0; -func_800775D0 = 0x800775D0; +dead_fx_misc_particles = 0x800775D0; dead_entity_upgrade_block_hide_content = 0x802F3B00; dead_create_popup_menu = 0x800FCD0C; dead_hide_popup_menu = 0x800F9260; @@ -407,7 +407,7 @@ dead_gPlayerActionState = 0x8011762C; dead_gPartnerActionStatus = 0x80117160; dead_80117163 = 0x80117160; dead_gPlayerData = 0x80117840; -dead_gCollisionStatus = 0x80169B12; +dead_gCollisionStatus = 0x80169B10; dead_gOverrideFlags = 0x800A15A8; dead_fx_motion_blur_flame = 0x80076970; D_800A1530 = 0x800A1530; @@ -418,7 +418,6 @@ dead_gCurrentEncounter = 0x800B7EF0; D_800B8DEC = 0x800B8DEC; dead_guMtxIdentF = 0x8006C660; dead_guMtxCatF = 0x8006C7C0; -D_80169B16 = 0x80169B16; D_80248380 = 0x80248380; D_8024854C = 0x8024854C; D_80246894 = 0x80246894; @@ -992,8 +991,6 @@ D_8029FBC0 = 0x8029FBC0; D_8029FBD0 = 0x8029FBD0; D_8029FBD4 = 0x8029FBD4; gActionCommandStatus = 0x8029FBE0; -D_8029FC2A = 0x8029FC2A; -D_8029FC4C = 0x8029FC4C; D_802A19B0 = 0x802A19B0; D_802A19C0 = 0x802A19C0; D_802A1A90 = 0x802A1A90; @@ -1307,17 +1304,4 @@ D_80246558_kkj_19 = 0x80246558; D_80246550_kkj_19 = 0x80246550; D_80246560_kkj_19 = 0x80246560; -// mgm_01 scripts (unsplit in E141D0.data.s) -D_80242310 = 0x80242310; -D_80242330 = 0x80242330; -D_80242350 = 0x80242350; -D_80242370 = 0x80242370; -D_80242390 = 0x80242390; -D_802423B0 = 0x802423B0; -D_802423D0 = 0x802423D0; -D_802423F0 = 0x802423F0; -D_80242410 = 0x80242410; -D_80242430 = 0x80242430; -D_80242450 = 0x80242450; - D_80242568_filemenu = 0x80242568;