diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 96ea78d8827..941e7ca55b8 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -448,11 +448,14 @@ segments: - [auto, c, world/actions] # DUMMY ROM - [auto, c, world/partners] - [auto, hasm, bss2_2] - - [0x89140, bin] + - [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] @@ -460,7 +463,8 @@ segments: - [auto, .rodata, 7fd10_len_b40] - [auto, .rodata, 80850_len_3060] - [auto, .rodata, world/partners] - - [0xA58E8, bin] + - [auto, .rodata, 891b0_len_fb0] + - [0xA5910, bin] - [0xa5f90] - name: engine4 diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index e2a94b06110..428032c7c18 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -53,30 +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; -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; @@ -1067,298 +1044,284 @@ b_area_kkj_Stages = 0x802185E4; b_area_dig_Formations = 0x8022A7C4; b_area_dig_Stages = 0x8022A83C; -i_spy_ROM_START = 0x80230000; -i_spy_ROM_END = 0x80231A64; -pulse_stone_ROM_START = 0x80231A64; -pulse_stone_ROM_END = 0x80231A64; -speech_bubble_ROM_START = 0x80231A64; -speech_bubble_ROM_END = 0x80231A64; -inspect_icon_ROM_START = 0x80231A64; -inspect_icon_ROM_END = 0x80231A64; +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; -gCollisionStatus = 0x80231A64; -handle_floor_behavior = 0x80231A64; -set_player_imgfx_comp = 0x80231A64; -func_800F0C9C = 0x80231A64; -set_player_imgfx_all = 0x80231A64; -WorldTattleInteractionID = 0x80231A64; -partner_use_ability = 0x80231A64; -set_peach_shadow_scale = 0x80231A64; -should_collider_allow_interact = 0x80231A64; -partner_reset_tether_distance = 0x80231A64; -interact_inspect_setup = 0x80231A64; -appendGfx_interact_prompt = 0x80231A64; -set_standard_shadow_scale = 0x80231A64; -gCurrentHiddenPanels = 0x80231A64; -ispy_notification_setup = 0x80231A64; -world_watt_sync_held_position = 0x80231A64; -get_entity_type = 0x80231A64; -appendGfx_speech_bubble = 0x80231A64; -interact_speech_setup = 0x80231A64; -appendGfx_pulse_stone_icon = 0x80231A64; -appendGfx_ispy_icon = 0x80231A64; -exec_ShakeCam1 = 0x80231A64; -pulse_stone_notification_setup = 0x80231A64; -sfx_play_sound_at_player = 0x80231A64; -partner_player_can_pause = 0x80231A64; -world_lakilester_can_dismount = 0x80231A64; -wPartnerHudScripts = 0x80231A64; -wDisabledPartnerHudScripts = 0x80231A64; -hide_popup_menu = 0x80231A64; -destroy_popup_menu = 0x80231A64; -switch_to_partner = 0x80231A64; -use_consumable = 0x80231A64; -create_standard_popup_menu = 0x80231A64; -HES_StatusHP = 0x80231A64; -HES_StatusHeart = 0x80231A64; -HES_StatusFP = 0x80231A64; -HES_StatusFlower = 0x80231A64; -HES_StatusCoin = 0x80231A64; -HES_StatusStarPoint = 0x80231A64; -HES_StatusSPShine = 0x80231A64; -HES_StatusStar1 = 0x80231A64; -func_800F0D5C = 0x80231A64; -HES_StatusTimes = 0x80231A64; -TimesHudScript = 0x80231A64; -DigitHudScripts = 0x80231A64; -SlashHudScript = 0x80231A64; -SPIncrementHudScripts = 0x80231A64; -StatusBarSPIncrementOffsets = 0x80231A64; -SPStarHudScripts = 0x80231A64; -HES_StatusSPEmptyIncrement = 0x80231A64; -HES_StatusStarEmpty = 0x80231A64; -copy_world_hud_element_ref_to_battle = 0x80231A64; -hud_element_set_tint = 0x80231A64; -HES_MenuTimes = 0x80231A64; -func_800F0CB0 = 0x80231A64; -func_800F102C = 0x80231A64; -func_800F0D80 = 0x80231A64; -hud_element_draw_clipped = 0x80231A64; -draw_number = 0x80231A64; -basic_hidden_window_update = 0x80231A64; -basic_window_update = 0x80231A64; +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 = 0x80231A64; -world_action_idle_ROM_START = 0x80231A64; -world_action_idle_ROM_END = 0x80231A64; -action_update_walk = 0x80231A64; -world_action_walk_ROM_START = 0x80231A64; -world_action_walk_ROM_END = 0x80231A64; -action_update_run = 0x80231A64; -action_update_jump = 0x80231A64; -world_action_jump_ROM_START = 0x80231A64; -world_action_jump_ROM_END = 0x80231A64; -action_update_landing_on_switch = 0x80231A64; -action_update_falling = 0x80231A64; -action_update_step_down = 0x80231A64; -action_update_land = 0x80231A64; -world_action_land_ROM_START = 0x80231A64; -world_action_land_ROM_END = 0x80231A64; -action_update_step_down_land = 0x80231A64; -action_update_talk = 0x80231A64; -world_action_misc_ROM_START = 0x80231A64; -world_action_misc_ROM_END = 0x80231A64; -action_update_spin_jump = 0x80231A64; -world_action_spin_jump_ROM_START = 0x80231A64; -world_action_spin_jump_ROM_END = 0x80231A64; -action_update_tornado_jump = 0x80231A64; -world_action_tornado_jump_ROM_START = 0x80231A64; -world_action_tornado_jump_ROM_END = 0x80231A64; -action_update_sliding = 0x80231A64; -world_action_slide_ROM_START = 0x80231A64; -world_action_slide_ROM_END = 0x80231A64; -action_update_hammer = 0x80231A64; -world_action_hammer_ROM_START = 0x80231A64; -world_action_hammer_ROM_END = 0x80231A64; -action_update_launch = 0x80231A64; -action_update_pushing_block = 0x80231A64; -action_update_hit_fire = 0x80231A64; -world_action_hit_fire_ROM_START = 0x80231A64; -world_action_hit_fire_ROM_END = 0x80231A64; -action_update_knockback = 0x80231A64; -world_action_knockback_ROM_START = 0x80231A64; -world_action_knockback_ROM_END = 0x80231A64; -action_update_hit_lava = 0x80231A64; -world_action_hit_lava_ROM_START = 0x80231A64; -world_action_hit_lava_ROM_END = 0x80231A64; -action_update_step_up_peach = 0x80231A64; -world_action_step_up_ROM_START = 0x80231A64; -world_action_step_up_ROM_END = 0x80231A64; -action_update_parasol = 0x80231A64; -world_action_sneaky_parasol_ROM_START = 0x80231A64; -world_action_sneaky_parasol_ROM_END = 0x80231A64; -action_update_spin = 0x80231A64; -world_action_spin_ROM_START = 0x80231A64; -world_action_spin_ROM_END = 0x80231A64; -action_update_first_strike = 0x80231A64; -action_update_raise_arms = 0x80231A64; -action_update_use_spinning_flower = 0x80231A64; -world_action_use_spinning_flower_ROM_START = 0x80231A64; -world_action_use_spinning_flower_ROM_END = 0x80231A64; -action_update_use_munchlesia = 0x80231A64; -world_action_use_munchlesia_ROM_START = 0x80231A64; -world_action_use_munchlesia_ROM_END = 0x80231A64; -action_update_use_tweester = 0x80231A64; -world_action_use_tweester_ROM_START = 0x80231A64; -world_action_use_tweester_ROM_END = 0x80231A64; -action_update_ride = 0x80231A64; -action_update_step_up = 0x80231A64; -action_update_state_23 = 0x80231A64; -get_worker = 0x80231A64; -create_worker_frontUI = 0x80231A64; +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_StatusSlash = 0x80231A64; +HES_MenuTimes = 0x80109400; -HES_StatusDigit0 = 0x80231A64; -HES_StatusDigit1 = 0x80231A64; -HES_StatusDigit2 = 0x80231A64; -HES_StatusDigit3 = 0x80231A64; -HES_StatusDigit4 = 0x80231A64; -HES_StatusDigit5 = 0x80231A64; -HES_StatusDigit6 = 0x80231A64; -HES_StatusDigit7 = 0x80231A64; -HES_StatusDigit8 = 0x80231A64; -HES_StatusDigit9 = 0x80231A64; +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_StatusSPIncrement0 = 0x80231A64; -HES_StatusSPIncrement1 = 0x80231A64; -HES_StatusSPIncrement2 = 0x80231A64; -HES_StatusSPIncrement3 = 0x80231A64; -HES_StatusSPIncrement4 = 0x80231A64; -HES_StatusSPIncrement5 = 0x80231A64; -HES_StatusSPIncrement6 = 0x80231A64; -HES_StatusSPIncrement7 = 0x80231A64; -HES_StatusSPIncrement8 = 0x80231A64; +HES_StatusSlash = 0x80108220; +HES_StatusTimes = 0x801081F8; -HES_StatusStar1 = 0x80231A64; -HES_StatusStar2 = 0x80231A64; -HES_StatusStar3 = 0x80231A64; -HES_StatusStar4 = 0x80231A64; -HES_StatusStar5 = 0x80231A64; -HES_StatusStar6 = 0x80231A64; -HES_StatusStar7 = 0x80231A64; +HES_StatusSPIncrement1 = 0x80108428; +HES_StatusSPIncrement2 = 0x80108450; +HES_StatusSPIncrement3 = 0x80108478; +HES_StatusSPIncrement4 = 0x801084A0; +HES_StatusSPIncrement5 = 0x801084C8; +HES_StatusSPIncrement6 = 0x801084F0; +HES_StatusSPIncrement7 = 0x80108518; +HES_StatusSPIncrement8 = 0x80108540; -world_use_item_ROM_START = 0x80231A64; -world_use_item_ROM_END = 0x80231A64; -world_use_item_VRAM = 0x80231A64; -EVS_World_UseItem = 0x80231A64; +HES_StatusStar1 = 0x80108568; +HES_StatusStar2 = 0x80108590; +HES_StatusStar3 = 0x801085B8; +HES_StatusStar4 = 0x801085E0; +HES_StatusStar5 = 0x80108608; +HES_StatusStar6 = 0x80108630; +HES_StatusStar7 = 0x80108658; -world_partner_goombario_ROM_START = 0x80231A64; -world_partner_goombario_ROM_END = 0x80231A64; -world_partner_goombario_VRAM = 0x80231A64; -world_goombario_init = 0x80231A64; -EVS_WorldGoombario_TakeOut = 0x80231A64; -EVS_WorldGoombario_Update = 0x80231A64; -EVS_WorldGoombario_PutAway = 0x80231A64; -EVS_WorldGoombario_UseAbility = 0x80231A64; -world_goombario_can_pause = 0x80231A64; -world_goombario_pre_battle = 0x80231A64; +world_use_item_ROM_START = 0x32d500; +world_use_item_ROM_END = 0x32ddd0; +world_use_item_VRAM = 0x802C0000; +EVS_World_UseItem = 0x802C059C; -world_partner_kooper_ROM_START = 0x80231A64; -world_partner_kooper_ROM_END = 0x80231A64; -world_partner_kooper_VRAM = 0x80231A64; -world_kooper_init = 0x80231A64; -EVS_WorldKooper_Update = 0x80231A64; -EVS_WorldKooper_PutAway = 0x80231A64; -EVS_WorldKooper_UseAbility = 0x80231A64; -world_kooper_pre_battle = 0x80231A64; -world_kooper_post_battle = 0x80231A64; -world_kooper_test_first_strike = 0x80231A64; -EVS_WorldKooper_TakeOut = 0x80231A64; +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_bombette_ROM_START = 0x80231A64; -world_partner_bombette_ROM_END = 0x80231A64; -world_partner_bombette_VRAM = 0x80231A64; -world_bombette_init = 0x80231A64; -EVS_WorldBombette_TakeOut = 0x80231A64; -EVS_WorldBombette_Update = 0x80231A64; -EVS_WorldBombette_PutAway = 0x80231A64; -EVS_WorldBombette_UseAbility = 0x80231A64; -world_bombette_test_first_strike = 0x80231A64; -world_bombette_can_use_ability = 0x80231A64; -world_bombette_can_player_pause = 0x80231A64; -world_bombette_pre_battle = 0x80231A64; +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_parakarry_ROM_START = 0x80231A64; -world_partner_parakarry_ROM_END = 0x80231A64; -world_partner_parakarry_VRAM = 0x80231A64; -world_parakarry_init = 0x80231A64; -EVS_WorldParakarry_TakeOut = 0x80231A64; -EVS_WorldParakarry_Update = 0x80231A64; -EVS_WorldParakarry_PutAway = 0x80231A64; -EVS_WorldParakarry_UseAbility = 0x80231A64; -world_parakarry_pre_battle = 0x80231A64; -world_parakarry_post_battle = 0x80231A64; +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_goompa_ROM_START = 0x80231A64; -world_partner_goompa_ROM_END = 0x80231A64; -world_partner_goompa_VRAM = 0x80231A64; -world_goompa_init = 0x80231A64; -EVS_WorldGoompa_TakeOut = 0x80231A64; -EVS_WorldGoompa_Update = 0x80231A64; -EVS_WorldGoompa_PutAway = 0x80231A64; -EVS_WorldGoompa_UseAbility = 0x80231A64; +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_watt_ROM_START = 0x80231A64; -world_partner_watt_ROM_END = 0x80231A64; -world_partner_watt_VRAM = 0x80231A64; -world_watt_init = 0x80231A64; -EVS_WorldWatt_TakeOut = 0x80231A64; -EVS_WorldWatt_Update = 0x80231A64; -EVS_WorldWatt_UseAbility = 0x80231A64; -EVS_WorldWatt_PutAway = 0x80231A64; -world_watt_pre_battle = 0x80231A64; -world_watt_post_battle = 0x80231A64; -EVS_WorldWatt_EnterMap = 0x80231A64; +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_sushie_ROM_START = 0x80231A64; -world_partner_sushie_ROM_END = 0x80231A64; -world_partner_sushie_VRAM = 0x80231A64; -world_sushie_init = 0x80231A64; -EVS_WorldSushie_TakeOut = 0x80231A64; -EVS_WorldSushie_Update = 0x80231A64; -EVS_WorldSushie_UseAbility = 0x80231A64; -world_sushie_pre_battle = 0x80231A64; -world_sushie_post_battle = 0x80231A64; -EVS_WorldSushie_EnterMap = 0x80231A64; -EVS_WorldSushie_PutAway = 0x80231A64; +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_lakilester_ROM_START = 0x80231A64; -world_partner_lakilester_ROM_END = 0x80231A64; -world_partner_lakilester_VRAM = 0x80231A64; -world_lakilester_init = 0x80231A64; -EVS_WorldLakilester_TakeOut = 0x80231A64; -EVS_WorldLakilester_Update = 0x80231A64; -EVS_WorldLakilester_PutAway = 0x80231A64; -EVS_WorldLakilester_UseAbility = 0x80231A64; -world_lakilester_pre_battle = 0x80231A64; -world_lakilester_post_battle = 0x80231A64; -EVS_WorldLakilester_EnterMap = 0x80231A64; +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_bow_ROM_START = 0x80231A64; -world_partner_bow_ROM_END = 0x80231A64; -world_partner_bow_VRAM = 0x80231A64; -world_bow_init = 0x80231A64; -EVS_WorldBow_TakeOut = 0x80231A64; -EVS_WorldBow_Update = 0x80231A64; -EVS_WorldBow_PutAway = 0x80231A64; -EVS_WorldBow_UseAbility = 0x80231A64; -world_bow_pre_battle = 0x80231A64; +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_goombaria_ROM_START = 0x80231A64; -world_partner_goombaria_ROM_END = 0x80231A64; -world_partner_goombaria_VRAM = 0x80231A64; -world_goombaria_init = 0x80231A64; -EVS_WorldGoombaria_TakeOut = 0x80231A64; -EVS_WorldGoombaria_Update = 0x80231A64; -EVS_WorldGoombaria_PutAway = 0x80231A64; -EVS_WorldGoombaria_UseAbility = 0x80231A64; +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_twink_ROM_START = 0x80231A64; -world_partner_twink_ROM_END = 0x80231A64; -world_partner_twink_VRAM = 0x80231A64; -world_twink_init = 0x80231A64; -EVS_WorldTwink_TakeOut = 0x80231A64; -EVS_WorldTwink_Update = 0x80231A64; -EVS_WorldTwink_UseAbility = 0x80231A64; -EVS_WorldTwink_PutAway = 0x80231A64; +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;