From 84185a143bdab0b33c797ab42a98ec8439e2ffc6 Mon Sep 17 00:00:00 2001 From: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Date: Sat, 14 Oct 2023 16:24:52 -0400 Subject: [PATCH] Some JP splits and decomp (#1116) * Some work * Fix build * PR comments * symbol renames --------- Co-authored-by: Ethan Roseman --- src/77480.c | 11 + src/7bb60_len_41b0.c | 2 + src/7fd10_len_b40.c | 11 +- src/world/actions.c | 39 ++ src/world/area_end/common/Credits.h | 2 +- src/world/partners.c | 43 +++ ver/jp/asm/bss2.s | 114 ++++++ ver/jp/asm/bss2_2.s | 225 ++++++++++++ ver/jp/splat.yaml | 534 +++++++++++++++------------- ver/jp/undefined_syms.txt | 320 +++++++++++++++-- 10 files changed, 1010 insertions(+), 291 deletions(-) create mode 100644 ver/jp/asm/bss2.s create mode 100644 ver/jp/asm/bss2_2.s diff --git a/src/77480.c b/src/77480.c index 24cab7e051..2a858c6085 100644 --- a/src/77480.c +++ b/src/77480.c @@ -17,6 +17,17 @@ #define i_spy_VRAM (void*)0x802B7000 #endif +#if VERSION_JP // TODO remove once segments are split +extern Addr i_spy_ROM_START; +extern Addr i_spy_ROM_END; +extern Addr pulse_stone_ROM_START; +extern Addr pulse_stone_ROM_END; +extern Addr speech_bubble_ROM_START; +extern Addr speech_bubble_ROM_END; +extern Addr inspect_icon_ROM_START; +extern Addr inspect_icon_ROM_END; +#endif + SHIFT_BSS UNK_FUN_PTR(ISpyNotificationCallback); SHIFT_BSS UNK_FUN_PTR(PulseStoneNotificationCallback); SHIFT_BSS UNK_FUN_PTR(TalkNotificationCallback); diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index 9e3997b88a..25b891d39b 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -974,7 +974,9 @@ void phys_main_collision_below(void) { break; } } else if (!(playerStatus->flags & PS_FLAG_FLYING) +#ifndef VERSION_JP && playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER +#endif ) { if (outLength <= collHeightHalf + temp_f24 && hitDirX == 0.0f && hitDirZ == 0.0f) { set_action_state(ACTION_STATE_STEP_DOWN); diff --git a/src/7fd10_len_b40.c b/src/7fd10_len_b40.c index 69cb9211df..30f3b47cf5 100644 --- a/src/7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -347,7 +347,9 @@ block_17: do { use_consumable(popup->userIndex[D_8010CCFC - 1]); } while (0); // todo required to match +#ifndef VERSION_JP gOverrideFlags |= GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS; +#endif break; } } @@ -386,16 +388,23 @@ void check_input_status_bar(void) { if (!(playerStatus->curButtons & (Z_TRIG | R_TRIG)) && (pressedButtons & BUTTON_C_UP) && func_800E9860()) { open_status_bar_long(); +#if VERSION_JP + sfx_play_sound(SOUND_LOWER_STATUS_BAR); +#else if (!is_picking_up_item()) { sfx_play_sound(SOUND_LOWER_STATUS_BAR); } +#endif } } else if (!(playerStatus->curButtons & (Z_TRIG | R_TRIG)) && (pressedButtons & BUTTON_C_UP) && func_800E9860()) { close_status_bar(); - +#if VERSION_JP + sfx_play_sound(SOUND_RAISE_STATUS_BAR); +#else if (!is_picking_up_item()) { sfx_play_sound(SOUND_RAISE_STATUS_BAR); } +#endif } } } diff --git a/src/world/actions.c b/src/world/actions.c index 95fb3f87fa..9e7e68fa1f 100644 --- a/src/world/actions.c +++ b/src/world/actions.c @@ -37,6 +37,45 @@ void action_update_use_munchlesia(void); void action_update_use_tweester(void); void action_update_state_23(void); +#if VERSION_JP // TODO remove once segments are split +extern Addr world_action_idle_ROM_START; +extern Addr world_action_idle_ROM_END; +extern Addr world_action_walk_ROM_START; +extern Addr world_action_walk_ROM_END; +extern Addr world_action_jump_ROM_START; +extern Addr world_action_jump_ROM_END; +extern Addr world_action_land_ROM_START; +extern Addr world_action_land_ROM_END; +extern Addr world_action_misc_ROM_START; +extern Addr world_action_misc_ROM_END; +extern Addr world_action_spin_jump_ROM_START; +extern Addr world_action_spin_jump_ROM_END; +extern Addr world_action_tornado_jump_ROM_START; +extern Addr world_action_tornado_jump_ROM_END; +extern Addr world_action_slide_ROM_START; +extern Addr world_action_slide_ROM_END; +extern Addr world_action_hammer_ROM_START; +extern Addr world_action_hammer_ROM_END; +extern Addr world_action_hit_fire_ROM_START; +extern Addr world_action_hit_fire_ROM_END; +extern Addr world_action_knockback_ROM_START; +extern Addr world_action_knockback_ROM_END; +extern Addr world_action_hit_lava_ROM_START; +extern Addr world_action_hit_lava_ROM_END; +extern Addr world_action_step_up_ROM_START; +extern Addr world_action_step_up_ROM_END; +extern Addr world_action_sneaky_parasol_ROM_START; +extern Addr world_action_sneaky_parasol_ROM_END; +extern Addr world_action_spin_ROM_START; +extern Addr world_action_spin_ROM_END; +extern Addr world_action_use_spinning_flower_ROM_START; +extern Addr world_action_use_spinning_flower_ROM_END; +extern Addr world_action_use_munchlesia_ROM_START; +extern Addr world_action_use_munchlesia_ROM_END; +extern Addr world_action_use_tweester_ROM_START; +extern Addr world_action_use_tweester_ROM_END; +#endif + s32 PrevPlayerCamRelativeYaw = 0; s32 D_800F7B44 = 0; f32 D_800F7B48 = 0.0f; diff --git a/src/world/area_end/common/Credits.h b/src/world/area_end/common/Credits.h index 83c42c6301..84c48560c8 100644 --- a/src/world/area_end/common/Credits.h +++ b/src/world/area_end/common/Credits.h @@ -6,7 +6,7 @@ #define STANDARD_POS_X 160 -#ifdef VERSION_PAL +#if VERSION_PAL #define STANDARD_APPEAR_TIME 33 #define STANDARD_HOLD_TIME 116 #define STANDARD_VANISH_TIME 25 diff --git a/src/world/partners.c b/src/world/partners.c index 50e8cb54ec..0383c1de60 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -115,6 +115,45 @@ extern HudScript HES_StatusSPIncrement7; extern EvtScript EVS_World_UseItem; +#if VERSION_JP // TODO remove once segments are split +extern Addr world_use_item_ROM_START; +extern Addr world_use_item_ROM_END; +extern Addr world_use_item_VRAM; +extern Addr world_partner_goombario_ROM_START; +extern Addr world_partner_goombario_ROM_END; +extern Addr world_partner_goombario_VRAM; +extern Addr world_partner_kooper_ROM_START; +extern Addr world_partner_kooper_ROM_END; +extern Addr world_partner_kooper_VRAM; +extern Addr world_partner_bombette_ROM_START; +extern Addr world_partner_bombette_ROM_END; +extern Addr world_partner_bombette_VRAM; +extern Addr world_partner_parakarry_ROM_START; +extern Addr world_partner_parakarry_ROM_END; +extern Addr world_partner_parakarry_VRAM; +extern Addr world_partner_goompa_ROM_START; +extern Addr world_partner_goompa_ROM_END; +extern Addr world_partner_goompa_VRAM; +extern Addr world_partner_watt_ROM_START; +extern Addr world_partner_watt_ROM_END; +extern Addr world_partner_watt_VRAM; +extern Addr world_partner_sushie_ROM_START; +extern Addr world_partner_sushie_ROM_END; +extern Addr world_partner_sushie_VRAM; +extern Addr world_partner_lakilester_ROM_START; +extern Addr world_partner_lakilester_ROM_END; +extern Addr world_partner_lakilester_VRAM; +extern Addr world_partner_bow_ROM_START; +extern Addr world_partner_bow_ROM_END; +extern Addr world_partner_bow_VRAM; +extern Addr world_partner_goombaria_ROM_START; +extern Addr world_partner_goombaria_ROM_END; +extern Addr world_partner_goombaria_VRAM; +extern Addr world_partner_twink_ROM_START; +extern Addr world_partner_twink_ROM_END; +extern Addr world_partner_twink_VRAM; +#endif + s32 partner_is_idle(Npc* partner); s32 world_partner_can_player_pause_default(Npc* partner); void _use_partner_ability(void); @@ -654,9 +693,13 @@ void _use_partner_ability(void) { } if (PartnerCommand >= PARTNER_CMD_INSTA_SWITCH) { +#if VERSION_JP + D_8010CFC4 = 0; +#else if (PartnerCommand != PARTNER_CMD_USE_ABILITY) { D_8010CFC4 = 0; } +#endif } switch (PartnerCommand) { diff --git a/ver/jp/asm/bss2.s b/ver/jp/asm/bss2.s new file mode 100644 index 0000000000..fd1019a927 --- /dev/null +++ b/ver/jp/asm/bss2.s @@ -0,0 +1,114 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +#ifndef SHIFT + +.section .bss + +dlabel PulseStoneNotificationCallback +.space 4 + +dlabel D_8010C924 +.space 4 + +dlabel D_8010C928 +.space 4 + +dlabel D_8010C92C +.space 4 + +dlabel wPartnerNpc +.space 4 + +dlabel TweesterTouchingPlayer +.space 4 + +dlabel PlayerNormalYaw +.space 4 + +dlabel ISpyNotificationCallback +.space 4 + +dlabel TalkNotificationCallback +.space 4 + +dlabel gSpinHistoryBufferPos +.space 4 + +dlabel D_8010C948 +.space 4 + +dlabel NpcHitQueryBehindRightY +.space 4 + +dlabel D_8010C950 +.space 4 + +dlabel TweesterTouchingPartner +.space 4 + +dlabel InteractNotificationCallback +.space 4 + +dlabel PrevPlayerDirection +.space 4 + +dlabel JumpedOnSwitchX +.space 4 + +dlabel D_8010C964 +.space 4 + +dlabel NpcHitQueryBehindCollider +.space 4 + +dlabel PeachDisguiseNpcIndex +.space 4 + +dlabel NpcHitQueryAheadY +.space 4 + +dlabel NpcHitQueryBehindLeftY +.space 4 + +dlabel NpcHitQueryColliderID +.space 4 + +dlabel JumpedOnSwitchZ +.space 4 + +dlabel PlayerRunStateTime +.space 4 + +dlabel D_8010C984 +.space 4 + +dlabel D_8010C988 +.space 4 + +dlabel NpcHitQueryAheadCollider +.space 4 + +dlabel PlayerNormalPitch +.space 4 + +dlabel D_8010C994 +.space 0x0000000c + +dlabel PlayerYInterpUpdateDelay +.space 4 + +dlabel D_8010C9A4 +.space 0x0000000c + +dlabel D_8010C9B0 +.space 4 + +dlabel D_8010C9B4 +.space 0x0000000c + +#endif diff --git a/ver/jp/asm/bss2_2.s b/ver/jp/asm/bss2_2.s new file mode 100644 index 0000000000..936065bab4 --- /dev/null +++ b/ver/jp/asm/bss2_2.s @@ -0,0 +1,225 @@ +.include "macro.inc" + +# assembler directives +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches +.set gp=64 # allow use of 64-bit general purpose registers + +#ifndef SHIFT + +.section .bss + +dlabel wPartnerTetherDistance +.space 4 + +dlabel D_8010CFC4 +.space 4 + +dlabel wPartnerFollowState +.space 2 + +dlabel D_8010CFCA +.space 2 + +dlabel D_8010CFCC +.space 2 + +dlabel D_8010CFCE +.space 2 + +dlabel wPartnerNpcIndex +.space 4 + +dlabel wPartnerCurrentScript +.space 4 + +dlabel wCurrentPartnerId +.space 4 + +dlabel wPartnerCurrentScriptID +.space 4 + +dlabel D_8010CFE0 +.space 4 + +dlabel NextPartnerID +.space 4 + +dlabel NextPartnerCommand +.space 4 + +dlabel wPartner +.space 4 + +dlabel D_8010CFF0 +.space 4 + +dlabel D_8010CFF4 +.space 4 + +dlabel D_8010CFF8 +.space 8 + +dlabel D_8010D000 +.space 0x63C + +dlabel D_8010D63C +.space 0x4 + +dlabel gPopupState +.space 4 + +dlabel D_8010D644 +.space 4 + +dlabel PopupMenu_SelectedIndex +.space 4 + +dlabel PopupMenu_PrevSelectedIndex +.space 4 + +dlabel PopupMenu_Alpha +.space 4 + +dlabel PopupMenu_FirstDisplayIndex +.space 1 + +dlabel PopupMenu_LastDisplayIndex +.space 1 + +dlabel PopupMenu_DisplayedEntryCount +.space 2 + +dlabel D_8010D658 +.space 2 + +dlabel D_8010D65A +.space 2 + +dlabel PopupMenu_EmptybarHEID +.space 4 + +dlabel PopupMenu_TitleIconHEID +.space 4 + +dlabel PopupMenu_TimesHEID +.space 4 + +dlabel PopupMenu_PartnerLevelHEID +.space 4 + +dlabel PopupMenu_CursorHEID +.space 4 + +dlabel PopupMenu_UpArrowHEID +.space 4 + +dlabel PopupMenu_DownArrowHEID +.space 4 + +dlabel PopupMenu_EntryIconHEID +.space 4 + +dlabel D_8010D67C +.space 2 + +dlabel D_8010D67E +.space 2 + +dlabel D_8010D680 +.space 2 + +dlabel D_8010D682 +.space 2 + +dlabel D_8010D684 +.space 2 + +dlabel D_8010D686 +.space 2 + +dlabel PopupMenu_StarPieceCounterPosX +.space 2 + +dlabel PopupMenu_StarPieceCounterPosY +.space 2 + +dlabel D_8010D68C +.space 2 + +dlabel PopupNotBattle +.space 1 + +dlabel PopupMenu_MaxDisplayableEntryCount +.space 1 + +dlabel D_8010D690 +.space 1 + +dlabel D_8010D691 +.space 1 + +dlabel D_8010D692 +.space 1 + +dlabel D_8010D693 +.space 1 + +dlabel gPopupWorker +.space 4 + +dlabel PopupNotDipping +.space 1 + +dlabel PopupDipMode +.space 1 + +dlabel D_8010D69A +.space 2 + +dlabel gPopupMenu +.space 4 + +dlabel D_8010D6A0 +.space 4 + +dlabel D_8010D6A4 +.space 4 + +dlabel D_8010D6A8 +.space 0x8 + +dlabel gBoxQuadBuffer +.space 0x1500 + +dlabel gPartnerStatus +.space 0x360 + +dlabel gSpinHistoryPosY +.space 0x18 + +dlabel gSpinHistoryPosX +.space 0x18 + +dlabel gSpinHistoryPosZ +.space 0x18 + +dlabel gUIStatus +.space 0x70 + +dlabel gPlayerStatus +.space 0x288 + +dlabel gPlayerSpinState +.space 0x34 + +dlabel D_8010F284 +.space 0xC + +dlabel gPlayerData +.space 0x428 + +dlabel gSpinHistoryPosAngle +.space 0x10 + +#endif diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index e084046d5b..52bc1ed063 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -1,10 +1,13 @@ name: Mario Story +sha1: b9cca3ff260b9ff427d981626b82f96de73586d3 options: basename: papermario find_file_boundaries: True compiler: GCC mnemonic_ljust: 10 platform: n64 + subalign: 8 + asm_data_macro: "dlabel" base_path: ../.. target_path: ver/jp/baserom.z64 @@ -18,8 +21,8 @@ options: build_path: ver/jp/build cache_path: ver/jp/.splat_cache create_undefined_funcs_auto: False - undefined_funcs_auto_path: ver/jp/undefined_funcs_auto.txt create_undefined_syms_auto: False + undefined_funcs_auto_path: ver/jp/undefined_funcs_auto.txt undefined_syms_auto_path: ver/jp/undefined_syms_auto.txt symbol_name_format: JP_$VRAM symbol_name_format_no_rom: JP_$VRAM_$SEG @@ -29,30 +32,34 @@ segments: - name: header type: header start: 0x00 - - [0x0040, bin] + - name: boot + type: code + start: 0x0040 + vram: 0xA4000040 + subsegments: + - [0x0040, bin] - name: main type: code start: 0x1000 vram: 0x80025C00 - subalign: 8 subsegments: - - [0x1000, hasm, main.bss] - - [0x1000, hasm, entry_point] - - [0x1060, c, is_debug, -g -fforce-addr] - - [0x1370, c, main_pre] - - [0x1370, c, main] - - [0x1B10, c, main_loop] - - [0x2570, c, background_gfx] - - [0x3BC0, c, input] - - [0x42B0, c, rumble] - - [0x43B0, c, 43F0] - - [0x5FC0, c, heap] - - [0x6200, c, fio] - - [0x6E00, c, curtains] - - [0x7300, c, crash_screen] - - [0x7E00, c, load_obfuscation_shims] - - [0x80A0, c, os/nusys/nugfxtaskmgr, -fforce-addr] - - [0x8490, c, cam_main] + - [auto, hasm, main.bss] + - [auto, hasm, entry_point] + - [auto, c, is_debug, -g -fforce-addr] + - [auto, c, main_pre] + - [auto, c, main] + - [auto, c, main_loop] + - [auto, c, background_gfx] + - [auto, c, input] + - [auto, c, rumble] + - [auto, c, 43F0] + - [auto, c, heap] + - [auto, c, fio] + - [auto, c, curtains] + - [auto, c, crash_screen] + - [auto, c, load_obfuscation_shims] + - [auto, c, os/nusys/nugfxtaskmgr, -fforce-addr] + - [auto, c, cam_main] - [auto, c, cam_mode_2] - [auto, c, cam_mode_1] - [auto, c, cam_mode_0] @@ -61,238 +68,238 @@ segments: - [auto, c, cam_mode_5] - [auto, c, cam_mode_zone_interp] - [auto, c, cam_math] - - [0xE580, c, game_modes] - - [0xE580, c, state_startup] - - [0xE860, c, startup_screen_fading] - - [0xE960, c, state_battle] - - [0xEF00, c, state_logos] - - [0xF9C0, c, state_pause] - - [0x10080, c, state_file_select] - - [0x10DB0, c, state_world] - - [0x10E70, c, 111f0_len_860] - - [0x116D0, c, state_intro] - - [0x11E70, c, state_title_screen] - - [0x13140, c, state_demo] - - [0x13530, c, npc] - - [0x19EB0, c, encounter] - - [0x1F240, c, encounter_api] - - [0x20B80, c, status_icons] - - [0x23330, c, 23680] - - [0x257A0, c, 25AF0] + - [auto, c, game_modes] + - [auto, c, state_startup] + - [auto, c, startup_screen_fading] + - [auto, c, state_battle] + - [auto, c, state_logos] + - [auto, c, state_pause] + - [auto, c, state_file_select] + - [auto, c, state_world] + - [auto, c, 111f0_len_860] + - [auto, c, state_intro] + - [auto, c, state_title_screen] + - [auto, c, state_demo] + - [auto, c, npc] + - [auto, c, encounter] + - [auto, c, encounter_api] + - [auto, c, status_icons] + - [auto, c, 23680] + - [auto, c, 25AF0] - - [0x25BB0, c, audio/25f00_len_940] - - [0x264F0, c, audio/sfx_player] - - [0x285C0, c, audio/28910_len_5090] - - [0x2BC40, c, audio/2BF90] - - [0x2D650, c, audio/2d9a0_len_890] - - [0x2DEE0, c, audio/2e230_len_2190] - - [0x30070, c, audio/303c0_len_3e10] - - [0x30100, c, audio/30450] - - [0x31300, c, audio/31650] - - [0x33100, c, audio/33450] - - [0x33E80, c, audio/tables] # data only - - [0x33E80, c, audio/reverb] + - [auto, c, audio/25f00_len_940] + - [auto, c, audio/sfx_player] + - [auto, c, audio/28910_len_5090] + - [auto, c, audio/2BF90] + - [auto, c, audio/2d9a0_len_890] + - [auto, c, audio/2e230_len_2190] + - [auto, c, audio/303c0_len_3e10] + - [auto, c, audio/30450] + - [auto, c, audio/31650] + - [auto, c, audio/33450] + - [auto, c, audio/tables] # data only + - [auto, c, audio/reverb] - - [0x34D30, c, effects] - - [0x34D30, c, 5B320] # data only - - [0x35770, c, world/world] - - [0x35F50, c, collision] - - [0x38BB0, c, 38F00] - - [0x38EC0, c, 39210_len_aa0] + - [auto, c, effects] + - [auto, c, 5B320] # data only + - [auto, c, world/world] + - [auto, c, collision] + - [auto, c, 38F00] + - [auto, c, 39210_len_aa0] - - [0x39960, c, os/nusys/nuboot] - - [0x39A60, c, os/nusys/nusched] - - [0x3A300, c, os/nusys/nugfxfuncset] - - [0x3A340, c, os/nusys/nugfxprenmifuncset] - - [0x3A380, c, os/nusys/nugfxtaskallendwait] - - [0x3A3A0, c, os/nusys/nugfxsetcfb] - - [0x3A4B0, c, os/nusys/nugfxdisplayoff] - - [0x3A4E0, c, os/nusys/nugfxdisplayon] - - [0x3A500, c, os/nusys/nupiinit] - - [0x3A540, c, os/nusys/nupireadrom] - - [0x3A610, c, os/nusys/nugfxinit] - - [0x3A6C0, c, os/nusys/nucontinit] - - [0x3A700, c, os/nusys/nucontdataget] - - [0x3A760, c, os/nusys/nucontpakmgr] - - [0x3A9D0, c, os/nusys/nucontrmbmgr] - - [0x3AF40, c, os/nusys/nucontrmbstart] - - [0x3AFA0, c, os/nusys/nucontrmbcheck] - - [0x3B040, c, os/nusys/nucontrmbmodeset] - - [0x3B150, c, os/nusys/nucontrmbforcestop] - - [0x3B170, c, os/nusys/nucontrmbforcestopend] - - [0x3B190, c, os/nusys/nupireadromoverlay] - - [0x3B2A0, c, os/nusys/nugfxthread] - - [0x3B3C0, c, os/nusys/nugfxswapcfbfuncset] - - [0x3B400, c, os/nusys/nugfxswapcfb] - - [0x3B420, c, os/nusys/nugfxretracewait] - - [0x3B4A0, c, os/nusys/nusimgr] - - [0x3B7C0, c, os/nusys/nusicallbackadd] - - [0x3B860, c, os/nusys/nusicallbackremove] - - [0x3B8E0, c, os/nusys/nucontmgr] - - [0x3BC90, c, os/nusys/nucontdatalock] - - [0x3BCF0, c, os/nusys/nucontqueryread] + - [auto, c, os/nusys/nuboot] + - [auto, c, os/nusys/nusched] + - [auto, c, os/nusys/nugfxfuncset] + - [auto, c, os/nusys/nugfxprenmifuncset] + - [auto, c, os/nusys/nugfxtaskallendwait] + - [auto, c, os/nusys/nugfxsetcfb] + - [auto, c, os/nusys/nugfxdisplayoff] + - [auto, c, os/nusys/nugfxdisplayon] + - [auto, c, os/nusys/nupiinit] + - [auto, c, os/nusys/nupireadrom] + - [auto, c, os/nusys/nugfxinit] + - [auto, c, os/nusys/nucontinit] + - [auto, c, os/nusys/nucontdataget] + - [auto, c, os/nusys/nucontpakmgr] + - [auto, c, os/nusys/nucontrmbmgr] + - [auto, c, os/nusys/nucontrmbstart] + - [auto, c, os/nusys/nucontrmbcheck] + - [auto, c, os/nusys/nucontrmbmodeset] + - [auto, c, os/nusys/nucontrmbforcestop] + - [auto, c, os/nusys/nucontrmbforcestopend] + - [auto, c, os/nusys/nupireadromoverlay] + - [auto, c, os/nusys/nugfxthread] + - [auto, c, os/nusys/nugfxswapcfbfuncset] + - [auto, c, os/nusys/nugfxswapcfb] + - [auto, c, os/nusys/nugfxretracewait] + - [auto, c, os/nusys/nusimgr] + - [auto, c, os/nusys/nusicallbackadd] + - [auto, c, os/nusys/nusicallbackremove] + - [auto, c, os/nusys/nucontmgr] + - [auto, c, os/nusys/nucontdatalock] + - [auto, c, os/nusys/nucontqueryread] - - [0x3BD10, hasm, os/osSetIntMask] - - [0x3BDB0, c, os/pimgr, gcc_272 -O3] - - [0x3BF40, c, os/epirawdma, gcc_272 -O3] - - [0x3C130, c, os/epiwrite, gcc_272 -O3] - - [0x3C190, c, os/epiread, gcc_272 -O3] - - [0x3C1F0, c, os/epidma, gcc_272 -O3] - - [0x3C290, c, os/epilinkhandle, gcc_272 -O3] - - [0x3C2E0, c, os/cartrominit, gcc_272 -O3] - - [0x3C460, c, os/devmgr, gcc_272 -O3] - - [0x3C820, c, os/piacs, gcc_272 -O3] - - [0x3C910, c, os/aigetlength, gcc_272 -O3] - - [0x3C920, c, os/aigetstatus, gcc_272 -O3] - - [0x3C930, c, os/aisetfrequency, gcc_272 -O3] - - [0x3CA50, c, os/aisetnextbuf, gcc_272 -O3] - - [0x3CAF0, hasm, os/osInvalDCache] - - [0x3CBA0, hasm, os/osInvalICache] - - [0x3CC20, hasm, os/osWritebackDCache] - - [0x3CCA0, hasm, os/osWritebackDCacheAll] - - [0x3CCD0, c, os/contquery, gcc_272 -O3] - - [0x3CD70, c, os/contreaddata, gcc_272 -O3] - - [0x3CF50, c, os/controller, gcc_272 -O3] - - [0x3D260, c, os/virtualtophysical, gcc_272 -O3] - - [0x3D2C0, c, os/sqrtf, -ffast-math] - - [0x3D2D0, c, os/coss, gcc_272 -O3] - - [0x3D300, c, os/frustum, gcc_272 -O3] - - [0x3D580, c, os/guLookAt, gcc_272 -O3] - - [0x3DC90, c, os/lookathil, gcc_272 -O3] - - [0x3E6F0, c, os/lookatref, gcc_272 -O3] - - [0x3ECE0, c, os/guOrtho, gcc_272 -O3] - - [0x3EF60, c, os/perspective, gcc_272 -O3] - - [0x3F2E0, c, os/position, gcc_272 -O3] - - [0x3F6A0, c, os/rotateRPY, gcc_272 -O3] - - [0x3F9C0, c, os/sins, gcc_272 -O3] - - [0x3FA20, hasm, os/bcopy] - - [0x3FD40, hasm, os/bzero] - - [0x3FDE0, c, os/string, gcc_272 -O3] - - [0x3FE70, c, os/xprintf, gcc_272 -O3] - - [0x408C0, c, os/sprintf, gcc_272 -O3] - - [0x40950, c, os/createmesgqueue] - - [0x40980, c, os/jammesg, gcc_272 -O3] - - [0x40AC0, c, os/recvmesg, gcc_272 -O3] - - [0x40BF0, c, os/sendmesg, gcc_272 -O3] - - [0x40D20, c, os/seteventmesg, gcc_272 -O3] - - [0x40DD0, hasm, os/osGetCount] - - [0x40DE0, c, os/sptask, gcc_272 -O3] - - [0x41020, c, os/sptaskyield, gcc_272 -O3] - - [0x41040, c, os/sptaskyielded, gcc_272 -O3] - - [0x41090, c, os/sirawdma, gcc_272 -O3] - - [0x41140, c, os/siacs, gcc_272 -O3] - - [0x41230, c, os/createthread, gcc_272 -O3] - - [0x41300, c, os/getthreadpri, gcc_272 -O3] - - [0x41320, c, os/setthreadpri, gcc_272 -O3] - - [0x413F0, c, os/startthread, gcc_272 -O3] - - [0x41510, c, os/stopthread, gcc_272 -O3] - - [0x415D0, c, os/thread, gcc_272 -O3] - - [0x41610, c, os/yieldthread, gcc_272 -O3] - - [0x41660, c, os/getactivequeue, gcc_272 -O3] - - [0x41670, c, os/gettime, gcc_272 -O3] - - [0x41700, c, os/settime, gcc_272 -O3] - - [0x41720, c, os/settimer, gcc_272 -O3] - - [0x41850, c, os/timerintr, gcc_272 -O3] - - [0x41B70, hasm, os/osMapTLB] - - [0x41C30, hasm, os/__osProbeTLB] - - [0x41CF0, hasm, os/osUnmapTLB] - - [0x41D30, hasm, os/osUnmapTLBAll] - - [0x41D80, c, os/vigetcurrframebuf, gcc_272 -O3] - - [0x41DC0, c, os/vigetnextframebuf, gcc_272 -O3] - - [0x41E00, c, os/vigetmode, gcc_272 -O3] - - [0x41E40, c, os/vimgr, gcc_272 -O3] - - [0x42180, c, os/vitbl, gcc_272 -O3] - - [0x42180, c, os/visetevent, gcc_272 -O3] - - [0x421E0, c, os/visetmode, gcc_272 -O3] - - [0x42230, c, os/visetspecial, gcc_272 -O3] - - [0x423A0, c, os/visetyscale, gcc_272 -O3] - - [0x423F0, c, os/viswapbuf, gcc_272 -O3] - - [0x42440, c, os/viswapcontext, gcc_272 -O3] - - [0x42750, c, os/viblack, gcc_272 -O3] - - [0x427B0, c, os/virepeatline, gcc_272 -O3] - - [0x42810, hasm, os/padding_alt] - - [0x42820, hasm, os/guMtxIdent] - - [0x42880, hasm, os/guMtxIdentF] - - [0x428E0, hasm, os/guMtxF2L] - - [0x42960, hasm, os/guMtxL2F] - - [0x429E0, hasm, os/guMtxCatF] - - [0x42AE0, hasm, os/guScale] - - [0x42BA0, hasm, os/guScaleF] - - [0x42C00, hasm, os/guTranslate] - - [0x42CE0, hasm, os/guTranslateF] - - [0x42D40, c, os/guMtxCat, gcc_272 -O3] - - [0x42DC0, c, os/guMtxXFML, gcc_272 -O3] - - [0x42E50, c, os/guMtxXFMF, gcc_272 -O3] - - [0x42F00, c, os/guRotate, gcc_272 -O3] - - [0x431E0, c, os/motor, gcc_272 -O3] - - [0x43570, c, os/pfsallocatefile, gcc_272 -O3] - - [0x439A0, c, os/pfsdeletefile, gcc_272 -O3] - - [0x43BC0, c, os/pfsreadwritefile, gcc_272 -O3] - - [0x44000, c, os/pfsfilestate, gcc_272 -O3] - - [0x441A0, c, os/pfsfindfile, gcc_272 -O3] - - [0x44360, c, os/pfsfreeblocks, gcc_272 -O3] - - [0x44470, c, os/pfsnumfiles, gcc_272 -O3] - - [0x44570, c, os/pfsinitpak, gcc_272 -O3] - - [0x44840, c, os/pfsrepairid, gcc_272 -O3] - - [0x448A0, c, os/pfsgetstatus, gcc_272 -O3] - - [0x44AB0, c, os/pfsselectbank, gcc_272 -O3] - - [0x44B20, c, os/contpfs, gcc_272 -O3] - - [0x455B0, c, os/contramread, gcc_272 -O3] - - [0x457A0, c, os/contramwrite, gcc_272 -O3] - - [0x459B0, hasm, os/parameters] - - [0x45A10, c, os/afterprenmi, gcc_272 -O3] - - [0x45A30, c, os/initialize, gcc_272 -O3] - - [0x45DD0, hasm, os/exceptasm] - - [0x46740, hasm, os/__osDisableInt] - - [0x467B0, hasm, os/__osRestoreInt] - - [0x467D0, c, os/setglobalintmask, gcc_272 -O3] - - [0x46810, c, os/resetglobalintmask, gcc_272 -O3] - - [0x46860, c, os/pirawdma, gcc_272 -O3] - - [0x46930, c, os/pigetcmdq, gcc_272 -O3] - - [0x46950, c, os/epirawread, gcc_272 -O3] - - [0x46AC0, c, os/epirawwrite, gcc_272 -O3] - - [0x46C30, c, os/ai, gcc_272 -O3] - - [0x46C50, hasm, os/bcmp] - - [0x46D60, c, os/xlitob, gcc_272 -O3] - - [0x46FB0, c, os/xldtob, gcc_272 -O3] - - [0x47A40, hasm, os/__osGetCause] - - [0x47A50, hasm, os/__osGetSR] - - [0x47A60, hasm, os/__osSetCompare] - - [0x47A70, hasm, os/setfpccsr] - - [0x47A80, hasm, os/setsr] - - [0x47A90, hasm, os/__osSetWatchLo] - - [0x47AA0, c, os/sp, gcc_272 -O3] - - [0x47AC0, c, os/spgetstat, gcc_272 -O3] - - [0x47AD0, c, os/spsetstat, gcc_272 -O3] - - [0x47AE0, c, os/spsetpc, gcc_272 -O3] - - [0x47B10, c, os/sprawdma, gcc_272 -O3] - - [0x47BA0, c, os/sirawread, gcc_272 -O3] - - [0x47BF0, c, os/sirawwrite, gcc_272 -O3] - - [0x47C40, c, os/crc, gcc_272 -O3] - - [0x47D30, c, os/destroythread, gcc_272 -O3] - - [0x47E10, hasm, os/osMapTLBRdb] - - [0x47E70, c, os/vi, gcc_272 -O3] - - [0x47F80, c, os/vigetcurrcontext, gcc_272 -O3] - - [0x47F90, hasm, os/padding] - - [0x47FA0, hasm, os/guNormalize] - - [0x48000, c, os/pfschecker, gcc_272 -O3] - - [0x48720, c, os/pfsisplug, gcc_272 -O3] - - [0x48A00, c, os/ldiv, gcc_272 -O3] - - [0x48BC0, c, os/osSiDeviceBusy] - - [0x48BE0, c, gcc/divdi3, -g2] - - [0x491A0, c, gcc/moddi3, -g2] - - [0x496F0, c, gcc/udivdi3, -g2] - - [0x49C50, c, gcc/umoddi3, -g2] - - [0x4A120, c, os/strcpy, gcc_272 -O1] - - [0x4A150, c, os/strcmp, gcc_272 -O1] - - [0x4A190, c, os/memset, gcc_272 -O1] - - [0x4A1D0, hasm, os/decode_yay0] - - [0x4A280, c, os/osFlash] + - [auto, hasm, os/osSetIntMask] + - [auto, c, os/pimgr, gcc_272 -O3] + - [auto, c, os/epirawdma, gcc_272 -O3] + - [auto, c, os/epiwrite, gcc_272 -O3] + - [auto, c, os/epiread, gcc_272 -O3] + - [auto, c, os/epidma, gcc_272 -O3] + - [auto, c, os/epilinkhandle, gcc_272 -O3] + - [auto, c, os/cartrominit, gcc_272 -O3] + - [auto, c, os/devmgr, gcc_272 -O3] + - [auto, c, os/piacs, gcc_272 -O3] + - [auto, c, os/aigetlength, gcc_272 -O3] + - [auto, c, os/aigetstatus, gcc_272 -O3] + - [auto, c, os/aisetfrequency, gcc_272 -O3] + - [auto, c, os/aisetnextbuf, gcc_272 -O3] + - [auto, hasm, os/osInvalDCache] + - [auto, hasm, os/osInvalICache] + - [auto, hasm, os/osWritebackDCache] + - [auto, hasm, os/osWritebackDCacheAll] + - [auto, c, os/contquery, gcc_272 -O3] + - [auto, c, os/contreaddata, gcc_272 -O3] + - [auto, c, os/controller, gcc_272 -O3] + - [auto, c, os/virtualtophysical, gcc_272 -O3] + - [auto, c, os/sqrtf, -ffast-math] + - [auto, c, os/coss, gcc_272 -O3] + - [auto, c, os/frustum, gcc_272 -O3] + - [auto, c, os/guLookAt, gcc_272 -O3] + - [auto, c, os/lookathil, gcc_272 -O3] + - [auto, c, os/lookatref, gcc_272 -O3] + - [auto, c, os/guOrtho, gcc_272 -O3] + - [auto, c, os/perspective, gcc_272 -O3] + - [auto, c, os/position, gcc_272 -O3] + - [auto, c, os/rotateRPY, gcc_272 -O3] + - [auto, c, os/sins, gcc_272 -O3] + - [auto, hasm, os/bcopy] + - [auto, hasm, os/bzero] + - [auto, c, os/string, gcc_272 -O3] + - [auto, c, os/xprintf, gcc_272 -O3] + - [auto, c, os/sprintf, gcc_272 -O3] + - [auto, c, os/createmesgqueue] + - [auto, c, os/jammesg, gcc_272 -O3] + - [auto, c, os/recvmesg, gcc_272 -O3] + - [auto, c, os/sendmesg, gcc_272 -O3] + - [auto, c, os/seteventmesg, gcc_272 -O3] + - [auto, hasm, os/osGetCount] + - [auto, c, os/sptask, gcc_272 -O3] + - [auto, c, os/sptaskyield, gcc_272 -O3] + - [auto, c, os/sptaskyielded, gcc_272 -O3] + - [auto, c, os/sirawdma, gcc_272 -O3] + - [auto, c, os/siacs, gcc_272 -O3] + - [auto, c, os/createthread, gcc_272 -O3] + - [auto, c, os/getthreadpri, gcc_272 -O3] + - [auto, c, os/setthreadpri, gcc_272 -O3] + - [auto, c, os/startthread, gcc_272 -O3] + - [auto, c, os/stopthread, gcc_272 -O3] + - [auto, c, os/thread, gcc_272 -O3] + - [auto, c, os/yieldthread, gcc_272 -O3] + - [auto, c, os/getactivequeue, gcc_272 -O3] + - [auto, c, os/gettime, gcc_272 -O3] + - [auto, c, os/settime, gcc_272 -O3] + - [auto, c, os/settimer, gcc_272 -O3] + - [auto, c, os/timerintr, gcc_272 -O3] + - [auto, hasm, os/osMapTLB] + - [auto, hasm, os/__osProbeTLB] + - [auto, hasm, os/osUnmapTLB] + - [auto, hasm, os/osUnmapTLBAll] + - [auto, c, os/vigetcurrframebuf, gcc_272 -O3] + - [auto, c, os/vigetnextframebuf, gcc_272 -O3] + - [auto, c, os/vigetmode, gcc_272 -O3] + - [auto, c, os/vimgr, gcc_272 -O3] + - [auto, c, os/vitbl, gcc_272 -O3] + - [auto, c, os/visetevent, gcc_272 -O3] + - [auto, c, os/visetmode, gcc_272 -O3] + - [auto, c, os/visetspecial, gcc_272 -O3] + - [auto, c, os/visetyscale, gcc_272 -O3] + - [auto, c, os/viswapbuf, gcc_272 -O3] + - [auto, c, os/viswapcontext, gcc_272 -O3] + - [auto, c, os/viblack, gcc_272 -O3] + - [auto, c, os/virepeatline, gcc_272 -O3] + - [auto, hasm, os/padding_alt] + - [auto, hasm, os/guMtxIdent] + - [auto, hasm, os/guMtxIdentF] + - [auto, hasm, os/guMtxF2L] + - [auto, hasm, os/guMtxL2F] + - [auto, hasm, os/guMtxCatF] + - [auto, hasm, os/guScale] + - [auto, hasm, os/guScaleF] + - [auto, hasm, os/guTranslate] + - [auto, hasm, os/guTranslateF] + - [auto, c, os/guMtxCat, gcc_272 -O3] + - [auto, c, os/guMtxXFML, gcc_272 -O3] + - [auto, c, os/guMtxXFMF, gcc_272 -O3] + - [auto, c, os/guRotate, gcc_272 -O3] + - [auto, c, os/motor, gcc_272 -O3] + - [auto, c, os/pfsallocatefile, gcc_272 -O3] + - [auto, c, os/pfsdeletefile, gcc_272 -O3] + - [auto, c, os/pfsreadwritefile, gcc_272 -O3] + - [auto, c, os/pfsfilestate, gcc_272 -O3] + - [auto, c, os/pfsfindfile, gcc_272 -O3] + - [auto, c, os/pfsfreeblocks, gcc_272 -O3] + - [auto, c, os/pfsnumfiles, gcc_272 -O3] + - [auto, c, os/pfsinitpak, gcc_272 -O3] + - [auto, c, os/pfsrepairid, gcc_272 -O3] + - [auto, c, os/pfsgetstatus, gcc_272 -O3] + - [auto, c, os/pfsselectbank, gcc_272 -O3] + - [auto, c, os/contpfs, gcc_272 -O3] + - [auto, c, os/contramread, gcc_272 -O3] + - [auto, c, os/contramwrite, gcc_272 -O3] + - [auto, hasm, os/parameters] + - [auto, c, os/afterprenmi, gcc_272 -O3] + - [auto, c, os/initialize, gcc_272 -O3] + - [auto, hasm, os/exceptasm] + - [auto, hasm, os/__osDisableInt] + - [auto, hasm, os/__osRestoreInt] + - [auto, c, os/setglobalintmask, gcc_272 -O3] + - [auto, c, os/resetglobalintmask, gcc_272 -O3] + - [auto, c, os/pirawdma, gcc_272 -O3] + - [auto, c, os/pigetcmdq, gcc_272 -O3] + - [auto, c, os/epirawread, gcc_272 -O3] + - [auto, c, os/epirawwrite, gcc_272 -O3] + - [auto, c, os/ai, gcc_272 -O3] + - [auto, hasm, os/bcmp] + - [auto, c, os/xlitob, gcc_272 -O3] + - [auto, c, os/xldtob, gcc_272 -O3] + - [auto, hasm, os/__osGetCause] + - [auto, hasm, os/__osGetSR] + - [auto, hasm, os/__osSetCompare] + - [auto, hasm, os/setfpccsr] + - [auto, hasm, os/setsr] + - [auto, hasm, os/__osSetWatchLo] + - [auto, c, os/sp, gcc_272 -O3] + - [auto, c, os/spgetstat, gcc_272 -O3] + - [auto, c, os/spsetstat, gcc_272 -O3] + - [auto, c, os/spsetpc, gcc_272 -O3] + - [auto, c, os/sprawdma, gcc_272 -O3] + - [auto, c, os/sirawread, gcc_272 -O3] + - [auto, c, os/sirawwrite, gcc_272 -O3] + - [auto, c, os/crc, gcc_272 -O3] + - [auto, c, os/destroythread, gcc_272 -O3] + - [auto, hasm, os/osMapTLBRdb] + - [auto, c, os/vi, gcc_272 -O3] + - [auto, c, os/vigetcurrcontext, gcc_272 -O3] + - [auto, hasm, os/padding] + - [auto, hasm, os/guNormalize] + - [auto, c, os/pfschecker, gcc_272 -O3] + - [auto, c, os/pfsisplug, gcc_272 -O3] + - [auto, c, os/ldiv, gcc_272 -O3] + - [auto, c, os/osSiDeviceBusy] + - [auto, c, gcc/divdi3, -g2] + - [auto, c, gcc/moddi3, -g2] + - [auto, c, gcc/udivdi3, -g2] + - [auto, c, gcc/umoddi3, -g2] + - [auto, c, os/strcpy, gcc_272 -O1] + - [auto, c, os/strcmp, gcc_272 -O1] + - [auto, c, os/memset, gcc_272 -O1] + - [auto, hasm, os/decode_yay0] + - [auto, c, os/osFlash] - [0x4AC70, pm_effect_loads, effect_loads] - - [0x4DF10, c, battle/battle] + - [auto, c, battle/battle] - [0x4E580, bin, n_aspMain_text] - - - [0x4F1E0, .data, main_pre] + - [0x4F1E0] + - [auto, .data, main_pre] - [auto, .data, main] - [auto, .data, main_loop] - [auto, .data, background_gfx] @@ -319,8 +326,6 @@ segments: - [0x511C0, vtx, theater/wall_shadows_vtx] - [0x51240] - [0x51520, ia8, ui/no_controller, 128, 32] - - [0x52520] - - [0x52520] - [auto, .data, crash_screen] - [auto, .data, os/nusys/nugfxtaskmgr] - [auto, .data, cam_math] @@ -432,13 +437,40 @@ segments: - [0x75990] - name: engine1 - dir: engine1 type: code start: 0x75990 vram: 0x800dc4e0 + # vram_of_symbol: overlays_start # TODO once this symbol is implemented subsegments: - - [0x75990, bin] - - [0xa5f90] + - [auto, hasm, bss2] + - [auto, c, npc_collision] + - [auto, c, 77480] + - [auto, c, 7B440] + - [auto, c, 7bb60_len_41b0] + - [auto, c, 7E9D0] + - [auto, c, 7fd10_len_b40] + - [auto, c, 80850_len_3060] + - [auto, c, world/actions] # DUMMY ROM + - [auto, c, world/partners] + - [auto, hasm, bss2_2] + - [auto, c, 891b0_len_fb0] + - [0x8A0F0, bin] + - [0x91170, .data, npc_collision] + - [auto, .data, world/actions] + - [auto, .data, world/partners] + - [0x91B40, bin] + - [0xA2AC0, .data, 891b0_len_fb0] + - [0xA2AF0, bin] + - [0xA5250, .rodata, 77480] + - [auto, .rodata, 7B440] + - [auto, .rodata, 7bb60_len_41b0] + - [auto, .rodata, 7E9D0] + - [auto, .rodata, 7fd10_len_b40] + - [auto, .rodata, 80850_len_3060] + - [auto, .rodata, world/partners] + - [auto, .rodata, 891b0_len_fb0] + - [0xA5910, bin] + - [0xa5f90] - name: engine4 dir: engine4 diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index d8aba0fc4f..428032c7c1 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -53,40 +53,7 @@ D_80074010 = 0x80073FF0; // main.bss // subsequent segments -npc_raycast_down_around = 0x800DC758; -npc_raycast_down_sides = 0x800DCB5C; -npc_test_move_taller_with_slipping = 0x800DDAC4; -npc_test_move_simple_with_slipping = 0x800DDC24; -npc_test_move_complex_with_slipping = 0x800DDD74; -update_player = 0x800DF720; -clear_player_status = 0x800DFC30; -player_reset_data = 0x800DFC54; -suggest_player_anim_allow_backward = 0x800DFEDC; -disable_player_input = 0x800E0158; -enable_player_input = 0x800E0184; -player_render_interact_prompts = 0x800E0240; -render_player = 0x800E1118; -set_action_state = 0x800E5D84; -start_bounce_a = 0x800E6014; -clear_player_data = 0x800E7340; -initialize_status_bar = 0x800E78D4; -draw_status_ui = 0x800E96DC; -close_status_bar = 0x800E9758; -func_800E97E4 = 0x800E9784; -status_bar_respond_to_changes = 0x800E9864; -reset_status_bar = 0x800E9B50; -is_ability_active = 0x800E9CE8; -partner_init_after_battle = 0x800EB194; -partner_reset_data = 0x800EB408; -partner_initialize_data = 0x800EB514; -partner_test_enemy_collision = 0x800EB578; -partner_handle_before_battle = 0x800EB5EC; -partner_handle_after_battle = 0x800EB658; -func_800EF3D4 = 0x800EF368; -partner_enable_input = 0x800EF594; -partner_disable_input = 0x800EF5BC; draw_box = 0x800F5470; -gPlayerStatusPtr = 0x0800F7CC0; HES_AsleepBegin = 0x80104E54; HES_AsleepEnd = 0x80104FF4; HES_ElectrifiedBegin = 0x80105238; @@ -142,11 +109,6 @@ HES_Peril = 0x80108B54; HES_Danger = 0x80108BA4; HES_MoveDiamond = 0x801094C8; HES_MoveDiamond_disabled = 0x80109568; -wPartnerNpc = 0x8010CAF0; -NpcHitQueryColliderID = 0x8010CB38; -gPartnerStatus = 0x08010ED70; -gPlayerStatus = 0x8010F188; -gPlayerData = 0x8010F450; spr_init_sprites = 0x80111448; spr_render_init = 0x801115B0; spr_update_player_sprite = 0x801115DC; @@ -1081,3 +1043,285 @@ b_area_kkj_Formations = 0x802185BC; b_area_kkj_Stages = 0x802185E4; b_area_dig_Formations = 0x8022A7C4; b_area_dig_Stages = 0x8022A83C; + +inspect_icon_ROM_START = 0xE28FA0; +inspect_icon_ROM_END = 0xE29D40; +speech_bubble_ROM_START = 0xE29D40; +speech_bubble_ROM_END = 0xE2A700; +pulse_stone_ROM_START = 0xE2A700; +pulse_stone_ROM_END = 0xE2B440; +i_spy_ROM_START = 0xE2B440; +i_spy_ROM_END = 0xE2C0F0; + +set_player_imgfx_comp = 0x80111A34; +set_player_imgfx_all = 0x80111B48; +WorldTattleInteractionID = 0x802BDF60; +set_standard_shadow_scale = 0x80117A6C; +set_peach_shadow_scale = 0x80117BE4; +gCollisionStatus = 0x8015F4D0; +should_collider_allow_interact = 0x8014AD98; +interact_inspect_setup = 0x802B70B4; +appendGfx_interact_prompt = 0x802B71E8; +gCurrentHiddenPanels = 0x8015F4F8; +ispy_notification_setup = 0x802b72c0; +world_watt_sync_held_position = 0x802BE06C; +get_entity_type = 0x801158B4; +appendGfx_speech_bubble = 0x802B71C8; +interact_speech_setup = 0x802B70B4; +appendGfx_pulse_stone_icon = 0x802B71D4; +appendGfx_ispy_icon = 0x802b7000; +exec_ShakeCam1 = 0x802CB56C; +pulse_stone_notification_setup = 0x802B7140; +sfx_play_sound_at_player = 0x8014ED88; +world_lakilester_can_dismount = 0x802BD7DC; +hide_popup_menu = 0x800f1340; +destroy_popup_menu = 0x800f14c8; +create_standard_popup_menu = 0x800f4fd4; +HES_StatusHP = 0x801083D8; +HES_StatusHeart = 0x801086A8; +HES_StatusFP = 0x80108400; +HES_StatusFlower = 0x801086C8; +HES_StatusCoin = 0x801086E8; +HES_StatusStarPoint = 0x8010883C; +HES_StatusSPShine = 0x80104D7C; +func_800F0D5C = 0x800F0CEC; +HES_StatusSPEmptyIncrement = 0x80108540; +HES_StatusStarEmpty = 0x80108680; +copy_world_hud_element_ref_to_battle = 0x8014a364; +hud_element_set_tint = 0x80149fac; +get_worker = 0x8012884c; +create_worker_frontUI = 0x8012844c; +func_800F0CB0 = 0x800f0c40; +func_800F102C = 0x800F0FBC; +func_800F0D80 = 0x800F0D10; +hud_element_draw_clipped = 0x80149858; +draw_number = 0x8012c8b0; +basic_hidden_window_update = 0x8014C624; +basic_window_update = 0x8014C524; + +action_update_idle = 0x802B6000; +world_action_idle_ROM_START = 0xE2C0F0; +world_action_idle_ROM_END = 0xE2C570; +action_update_walk = 0x802B6000; +world_action_walk_ROM_START = 0xE2C570; +world_action_walk_ROM_END = 0xE2CED0; +action_update_run = 0x802B6288; +action_update_jump = 0x802B60B4; +world_action_jump_ROM_START = 0xE2CED0; +world_action_jump_ROM_END = 0xE2D460; +action_update_landing_on_switch = 0x802B6198; +action_update_falling = 0x802B6294; +action_update_step_down = 0x802B6348; +action_update_land = 0x802B6000; +world_action_land_ROM_START = 0xE2D790; +world_action_land_ROM_END = 0xE2DD40; +action_update_step_down_land = 0x802B61C0; +action_update_talk = 0x802B6638; +world_action_misc_ROM_START = 0xE318A0; +world_action_misc_ROM_END = 0xE32010; +action_update_spin_jump = 0x802B6000; +world_action_spin_jump_ROM_START = 0xE2FC50; +world_action_spin_jump_ROM_END = 0xE30380; +action_update_tornado_jump = 0x802B6000; +world_action_tornado_jump_ROM_START = 0xE2F580; +world_action_tornado_jump_ROM_END = 0xE2FC50; +action_update_sliding = 0x802B6060; +world_action_slide_ROM_START = 0xE30380; +world_action_slide_ROM_END = 0xE30B00; +action_update_hammer = 0x802B66a8; +world_action_hammer_ROM_START = 0xE2DD40; +world_action_hammer_ROM_END = 0xE2EBD0; +action_update_launch = 0x802B6350; +action_update_pushing_block = 0x802B6508; +action_update_hit_fire = 0x802B6000; +world_action_hit_fire_ROM_START = 0xE30B00; +world_action_hit_fire_ROM_END = 0xE30DB0; +action_update_knockback = 0x802B6000; +world_action_knockback_ROM_START = 0xE31660; +world_action_knockback_ROM_END = 0xE318A0; +action_update_hit_lava = 0x802B6000; +world_action_hit_lava_ROM_START = 0xE30DB0; +world_action_hit_lava_ROM_END = 0xE31660; +action_update_step_up_peach = 0x802B6230; +world_action_step_up_ROM_START = 0xE2D460; +world_action_step_up_ROM_END = 0xE2D790; +action_update_parasol = 0x802B6120; +world_action_sneaky_parasol_ROM_START = 0xE33530; +world_action_sneaky_parasol_ROM_END = 0xE343B0; +action_update_spin = 0x802B6000; +world_action_spin_ROM_START = 0xE2EBD0; +world_action_spin_ROM_END = 0XE2F580; +action_update_first_strike = 0x802B63D4; +action_update_raise_arms = 0x802B6478; +action_update_use_spinning_flower = 0x802B60A4; +world_action_use_spinning_flower_ROM_START = 0xE322E0; +world_action_use_spinning_flower_ROM_END = 0xE331C0; +action_update_use_munchlesia = 0x802B6000; +world_action_use_munchlesia_ROM_START = 0xE32010; +world_action_use_munchlesia_ROM_END = 0xE322E0; +action_update_use_tweester = 0x802B6000; +world_action_use_tweester_ROM_START = 0xE331C0; +world_action_use_tweester_ROM_END = 0xE33530; +action_update_ride = 0x802B6000; +action_update_step_up = 0x802B6000; +action_update_state_23 = 0x802B609C; + +HES_MenuTimes = 0x80109400; + +HES_StatusDigit0 = 0x80108248; +HES_StatusDigit1 = 0x80108270; +HES_StatusDigit2 = 0x80108298; +HES_StatusDigit3 = 0x801082C0; +HES_StatusDigit4 = 0x801082E8; +HES_StatusDigit5 = 0x80108310; +HES_StatusDigit6 = 0x80108338; +HES_StatusDigit7 = 0x80108360; +HES_StatusDigit8 = 0x80108388; +HES_StatusDigit9 = 0x801083B0; + +HES_StatusSlash = 0x80108220; +HES_StatusTimes = 0x801081F8; + +HES_StatusSPIncrement1 = 0x80108428; +HES_StatusSPIncrement2 = 0x80108450; +HES_StatusSPIncrement3 = 0x80108478; +HES_StatusSPIncrement4 = 0x801084A0; +HES_StatusSPIncrement5 = 0x801084C8; +HES_StatusSPIncrement6 = 0x801084F0; +HES_StatusSPIncrement7 = 0x80108518; +HES_StatusSPIncrement8 = 0x80108540; + +HES_StatusStar1 = 0x80108568; +HES_StatusStar2 = 0x80108590; +HES_StatusStar3 = 0x801085B8; +HES_StatusStar4 = 0x801085E0; +HES_StatusStar5 = 0x80108608; +HES_StatusStar6 = 0x80108630; +HES_StatusStar7 = 0x80108658; + +world_use_item_ROM_START = 0x32d500; +world_use_item_ROM_END = 0x32ddd0; +world_use_item_VRAM = 0x802C0000; +EVS_World_UseItem = 0x802C059C; + +world_partner_goombario_ROM_START = 0x31F430; +world_partner_goombario_ROM_END = 0x320260; +world_partner_goombario_VRAM = 0x802BD100; +world_goombario_init = 0x802BD174; +EVS_WorldGoombario_TakeOut = 0x802BDD6C; +EVS_WorldGoombario_Update = 0x802BDD8C; +EVS_WorldGoombario_UseAbility = 0x802BDDA8; +EVS_WorldGoombario_PutAway = 0x802BDE60; +world_goombario_can_pause = 0x802BD5A8; +world_goombario_pre_battle = 0x802BDBC0; + +world_partner_kooper_ROM_START = 0x323530; +world_partner_kooper_ROM_END = 0x325080; +world_partner_kooper_VRAM = 0x802BD100; +world_kooper_init = 0x802BD200; +EVS_WorldKooper_TakeOut = 0x802BEB44; +EVS_WorldKooper_Update = 0x802BEB64; +EVS_WorldKooper_UseAbility = 0x802BEB80; +EVS_WorldKooper_PutAway = 0x802BEB9C; +world_kooper_test_first_strike = 0x802BE818; +world_kooper_pre_battle = 0x802BEA24; +world_kooper_post_battle = 0x802BEB10; + +world_partner_bombette_ROM_START = 0x320260; +world_partner_bombette_ROM_END = 0x321a80; +world_partner_bombette_VRAM = 0x802BD100; +world_bombette_init = 0x802BD2D8; +EVS_WorldBombette_TakeOut = 0x802BE880; +EVS_WorldBombette_Update = 0x802BE8A0; +EVS_WorldBombette_UseAbility = 0x802BE8BC; +EVS_WorldBombette_PutAway = 0x802BE8D8; +world_bombette_test_first_strike = 0x802BE520; +world_bombette_can_use_ability = 0x802BD720; +world_bombette_can_player_pause = 0x802BD748; +world_bombette_pre_battle = 0x802BE6E8; + +world_partner_parakarry_ROM_START = 0x321a80; +world_partner_parakarry_ROM_END = 0x323530; +world_partner_parakarry_VRAM = 0x802BD100; +world_parakarry_init = 0x802BD100; +EVS_WorldParakarry_TakeOut = 0x802BEA90; +EVS_WorldParakarry_Update = 0x802BEAB0; +EVS_WorldParakarry_UseAbility = 0x802BEACC; +EVS_WorldParakarry_PutAway = 0x802BEAE8; +world_parakarry_pre_battle = 0x802BE90C; +world_parakarry_post_battle = 0x802BE9D0; + +world_partner_goompa_ROM_START = 0x32cd40; +world_partner_goompa_ROM_END = 0x32d240; +world_partner_goompa_VRAM = 0x802BD100; +world_goompa_init = 0x802BD100; +EVS_WorldGoompa_TakeOut = 0x802BD570; +EVS_WorldGoompa_Update = 0x802BD590; +EVS_WorldGoompa_UseAbility = 0x802BD5AC; +EVS_WorldGoompa_PutAway = 0x802BD5C8; + +world_partner_watt_ROM_START = 0x325080; +world_partner_watt_ROM_END = 0x326270; +world_partner_watt_VRAM = 0x802BD100; +world_watt_init = 0x802BD23C; +EVS_WorldWatt_TakeOut = 0x802BE248; +EVS_WorldWatt_Update = 0x802BE26C; +EVS_WorldWatt_UseAbility = 0x802BE288; +EVS_WorldWatt_PutAway = 0x802BE2A4; +world_watt_pre_battle = 0x802BDD98; +world_watt_post_battle = 0x802BDE0C; +EVS_WorldWatt_EnterMap = 0x802BE2C0; + +world_partner_sushie_ROM_START = 0x326270; +world_partner_sushie_ROM_END = 0x328FF0; +world_partner_sushie_VRAM = 0x802BD100; +world_sushie_init = 0x802BF4C4; +EVS_WorldSushie_TakeOut = 0x802BFD7C; +EVS_WorldSushie_Update = 0x802BFD9C; +EVS_WorldSushie_UseAbility = 0x802BFD60; +EVS_WorldSushie_PutAway = 0x802BFDB8; +world_sushie_pre_battle = 0x802BF95C; +world_sushie_post_battle = 0x802BF9FC; +EVS_WorldSushie_EnterMap = 0x802BFDD4; + +world_partner_lakilester_ROM_START = 0x328FF0; +world_partner_lakilester_ROM_END = 0x32BD80; +world_partner_lakilester_VRAM = 0x802BD100; +world_lakilester_init = 0x802BD21C; +EVS_WorldLakilester_TakeOut = 0x802BFDF0; +EVS_WorldLakilester_Update = 0x802BFE10; +EVS_WorldLakilester_UseAbility = 0x802BFE2C; +EVS_WorldLakilester_PutAway = 0x802BFE48; +world_lakilester_pre_battle = 0x802BF998; +world_lakilester_post_battle = 0x802BFA40; +EVS_WorldLakilester_EnterMap = 0x802BFE64; + +world_partner_bow_ROM_START = 0x32BD80; +world_partner_bow_ROM_END = 0x32CD40; +world_partner_bow_VRAM = 0x802BD100; +world_bow_init = 0x802BD100; +EVS_WorldBow_TakeOut = 0x802BDFE0; +EVS_WorldBow_Update = 0x802BE000; +EVS_WorldBow_UseAbility = 0x802BE01C; +EVS_WorldBow_PutAway = 0x802BE038; +world_bow_pre_battle = 0x802BDF64; + +world_partner_goombaria_ROM_START = 0x32D240; +world_partner_goombaria_ROM_END = 0x32D3A0; +world_partner_goombaria_VRAM = 0x802BD100; +world_goombaria_init = 0x802BD100; +EVS_WorldGoombaria_TakeOut = 0x802BD1F0; +EVS_WorldGoombaria_Update = 0x802BD20C; +EVS_WorldGoombaria_UseAbility = 0x802BD228; +EVS_WorldGoombaria_PutAway = 0x802BD244; + +world_partner_twink_ROM_START = 0x32D3A0; +world_partner_twink_ROM_END = 0x32D500; +world_partner_twink_VRAM = 0x802BD100; +world_twink_init = 0x802BD100; +EVS_WorldTwink_TakeOut = 0x802BD1F0; +EVS_WorldTwink_Update = 0x802BD20C; +EVS_WorldTwink_UseAbility = 0x802BD228; +EVS_WorldTwink_PutAway = 0x802BD244; + +D_80109610_JP = 0x80109610;