From 625d7874c5810f8cbc815b3b36d3d2c7fe97b0ff Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 2 Feb 2023 20:23:17 +0900 Subject: [PATCH] Shiftability, naming of things (#930) * Naming, shiftability fixes, etc * follows_vram fixes * more goods * tweesterz * agh * warnings * agh --- include/entity.h | 2 +- include/functions.h | 10 +- src/1AF230.c | 4 + src/316f30.c | 27 ---- src/77480.c | 24 ++-- src/7E9D0.c | 13 +- src/a5dd0_len_114e0.c | 11 +- src/battle/area_kzn2/actor/lava_bud.c | 8 +- src/battle/area_kzn2/actor/lava_piranha.c | 12 +- src/battle/battle.h | 12 ++ ...6d90.c => battle_heap_create_obfuscated.c} | 6 +- ...9f0.c => create_audio_system_obfuscated.c} | 4 +- ...C00.c => general_heap_create_obfuscated.c} | 6 +- src/{E225B0.c => i_spy.c} | 0 src/{E20110.c => inspect_icon.c} | 14 +- ...316a70.c => load_engine_data_obfuscated.c} | 6 +- src/{8560.c => load_obfuscation_shims.c} | 20 +-- src/main.c | 10 +- src/msg.c | 118 +++++++++-------- src/obfuscation_shims.c | 43 +++++++ src/{E21870.c => pulse_stone.c} | 8 +- src/{e20eb0.c => speech_bubble.c} | 16 +-- src/state_battle.c | 6 +- src/state_pause.c | 4 +- src/world/area_sbk/sbk_14/sbk_14_2_entity.c | 14 +- src/world/area_sbk/sbk_23/sbk_23_2_entity.c | 14 +- src/world/area_sbk/sbk_33/sbk_33_1_entity.c | 14 +- src/world/area_sbk/sbk_41/sbk_41_2_entity.c | 14 +- src/world/area_sbk/sbk_54/sbk_54_2_entity.c | 14 +- src/world/area_tst/tst_10/tst_10_1_main.c | 20 +-- src/world/partner/goombario.c | 6 +- src/world/partners.c | 6 +- src/world/world.c | 8 +- tools/warnings_count/check_new_warnings.sh | 1 + ver/jp/undefined_funcs_auto.txt | 4 +- .../data/world/area_jan/jan_01/B29400.data.s | 2 +- .../data/world/area_jan/jan_02/B2ED90.data.s | 2 +- .../data/world/area_jan/jan_03/B37E60.data.s | 2 +- .../data/world/area_jan/jan_04/B45860.data.s | 2 +- .../data/world/area_jan/jan_05/B4D140.data.s | 2 +- .../data/world/area_jan/jan_06/B54E10.data.s | 2 +- .../data/world/area_jan/jan_07/B5AA90.data.s | 2 +- .../data/world/area_jan/jan_08/B606E0.data.s | 2 +- .../data/world/area_jan/jan_09/B673D0.data.s | 2 +- .../data/world/area_jan/jan_10/B6DAD0.data.s | 2 +- .../data/world/area_jan/jan_12/B74310.data.s | 2 +- .../data/world/area_jan/jan_13/B76D80.data.s | 2 +- .../data/world/area_jan/jan_14/B7B330.data.s | 2 +- .../data/world/area_jan/jan_15/B7DC20.data.s | 2 +- .../data/world/area_jan/jan_16/B80540.data.s | 2 +- .../data/world/area_jan/jan_18/B83B90.data.s | 2 +- .../data/world/area_jan/jan_22/B85AE0.data.s | 2 +- .../data/world/area_jan/jan_23/B8FCD0.data.s | 2 +- .../data/world/area_kkj/kkj_03/AC9A40.data.s | 2 +- .../data/world/area_kkj/kkj_13/AD6630.data.s | 2 +- .../data/world/area_kkj/kkj_14/ADB360.data.s | 2 +- .../data/world/area_kkj/kkj_18/AF34C0.data.s | 2 +- .../data/world/area_kkj/kkj_22/B024F0.data.s | 2 +- .../data/world/area_kkj/kkj_23/B03250.data.s | 2 +- .../data/world/area_kkj/kkj_24/B06590.data.s | 2 +- .../data/world/area_kkj/kkj_25/B07940.data.s | 2 +- .../data/world/area_kkj/kkj_26/B13150.data.s | 2 +- .../data/world/area_nok/nok_01/9C7F50.data.s | 2 +- .../data/world/area_nok/nok_02/9DB5C0.data.s | 2 +- .../data/world/area_nok/nok_03/9EC610.data.s | 2 +- .../data/world/area_nok/nok_04/9EEB20.data.s | 2 +- .../data/world/area_pra/pra_32/D87240.data.s | 2 +- .../data/world/area_sam/sam_02/D072F0.data.s | 2 +- .../data/world/area_sam/sam_03/D119E0.data.s | 2 +- .../data/world/area_sam/sam_04/D13CD0.data.s | 2 +- .../data/world/area_sam/sam_05/D1A520.data.s | 2 +- .../data/world/area_sam/sam_07/D2DD30.data.s | 2 +- .../data/world/area_sam/sam_08/D31430.data.s | 2 +- .../data/world/area_sam/sam_09/D366F0.data.s | 2 +- .../data/world/area_sam/sam_10/D384A0.data.s | 2 +- .../data/world/area_sam/sam_11/D3C740.data.s | 2 +- ver/us/splat.yaml | 120 +++++++++++++++--- ver/us/symbol_addrs.txt | 26 ++-- ver/us/undefined_syms.txt | 14 +- 79 files changed, 439 insertions(+), 302 deletions(-) delete mode 100644 src/316f30.c rename src/{316d90.c => battle_heap_create_obfuscated.c} (86%) rename src/{3169f0.c => create_audio_system_obfuscated.c} (82%) rename src/{316C00.c => general_heap_create_obfuscated.c} (88%) rename src/{E225B0.c => i_spy.c} (100%) rename src/{E20110.c => inspect_icon.c} (97%) rename src/{316a70.c => load_engine_data_obfuscated.c} (85%) rename src/{8560.c => load_obfuscation_shims.c} (74%) create mode 100644 src/obfuscation_shims.c rename src/{E21870.c => pulse_stone.c} (97%) rename src/{e20eb0.c => speech_bubble.c} (94%) diff --git a/include/entity.h b/include/entity.h index 1b54a1edfb..b2f30bb1df 100644 --- a/include/entity.h +++ b/include/entity.h @@ -291,7 +291,7 @@ typedef struct BombableRockData { /* 0x88 */ f32 fragmentFallSpeed[6]; } BombableRockData; // size = 0xA0 -typedef s32 TweesterPath[0]; +typedef s32 TweesterPath[]; typedef struct TweesterData { /* 0x00 */ s8 unk_00; diff --git a/include/functions.h b/include/functions.h index c95c2532da..3ebf3e991f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -23,7 +23,7 @@ void is_debug_init(void); f32 signF(f32 val); s32 func_8002ACDC(void); -void func_8002D160(void); +void load_obfuscation_shims(void); void* heap_malloc(s32 size); void* _heap_malloc(HeapNode* head, u32 size); @@ -748,10 +748,10 @@ void game_mode_set_fpDrawAuxUI(s32 i, void (*fn)(void)); void func_80260A60(void); -void func_802B2000(void); -void func_802B203C(void); -void func_802B2078(void); -void func_802B20B4(void); +void shim_create_audio_system_obfuscated(void); +void shim_load_engine_data_obfuscated(void); +void shim_general_heap_create_obfuscated(void); +void shim_battle_heap_create_obfuscated(void); void func_802B7000_E225B0(void); void func_802B70B4_E201C4(void); void func_802B7140(void); diff --git a/src/1AF230.c b/src/1AF230.c index aae86edfc4..6ae0b19beb 100644 --- a/src/1AF230.c +++ b/src/1AF230.c @@ -126,3 +126,7 @@ ApiStatus LoadStarPowerScript(Evt* script, s32 isInitialCall) { script->varTable[0] = (s32) (&D_8029C7D0[starPowerIdx])->init; return ApiStatus_DONE2; } + +#ifndef SHIFT +static BSS u8 bss_padding[0x1390]; +#endif diff --git a/src/316f30.c b/src/316f30.c deleted file mode 100644 index 6a0dc16abb..0000000000 --- a/src/316f30.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "common.h" -#include "ld_addrs.h" - -void func_80200000(void); -void func_80200080(void); -void func_802AE000_316C00(void); -void func_802AE000(void); - -void func_802B2000(void) { - dma_copy(_3169F0_ROM_START, _3169F0_ROM_END, _3169F0_VRAM); - func_80200000(); -} - -void func_802B203C(void) { - dma_copy(_316A70_ROM_START, _316A70_ROM_END, _316A70_VRAM); - func_80200080(); -} - -void func_802B2078(void) { - dma_copy(_316C00_ROM_START, _316C00_ROM_END, _316C00_VRAM); - func_802AE000_316C00(); -} - -void func_802B20B4(void) { - dma_copy(_316D90_ROM_START, _316D90_ROM_END, _316D90_VRAM); - func_802AE000(); -} diff --git a/src/77480.c b/src/77480.c index d8cff99c1e..8bde43ff2a 100644 --- a/src/77480.c +++ b/src/77480.c @@ -3,11 +3,17 @@ #include "world/actions.h" #include "sprite.h" - // TODO shiftability fix -#define E20110_VRAM_DEF (void*)0x802B7000 -#define E20EB0_VRAM_DEF (void*)0x802B7000 -#define E21870_VRAM_DEF (void*)0x802B7000 -#define E225B0_VRAM_DEF (void*)0x802B7000 +#ifdef SHIFT +#define inspect_icon_VRAM_DEF inspect_icon_VRAM +#define speech_bubble_VRAM_DEF speech_bubble_VRAM +#define pulse_stone_VRAM_DEF pulse_stone_VRAM +#define i_spy_VRAM_DEF i_spy_VRAM +#else +#define inspect_icon_VRAM_DEF (void*)0x802B7000 +#define speech_bubble_VRAM_DEF (void*)0x802B7000 +#define pulse_stone_VRAM_DEF (void*)0x802B7000 +#define i_spy_VRAM_DEF (void*)0x802B7000 +#endif extern f32 D_800F7B48; extern s32 D_800F7B4C; @@ -989,7 +995,7 @@ void check_for_ispy(void) { if (D_8015A57A != 0 && ISpyNotificationCallback == NULL) { if (!(playerStatus->animFlags & (PA_FLAG_SPEECH_PROMPT_AVAILABLE | PA_FLAG_INTERACT_PROMPT_AVAILABLE))) { - dma_copy(E225B0_ROM_START, E225B0_ROM_END, E225B0_VRAM_DEF); + dma_copy(i_spy_ROM_START, i_spy_ROM_END, i_spy_VRAM_DEF); ISpyNotificationCallback = func_802B72C0_E22870; } } @@ -1038,7 +1044,7 @@ void check_for_pulse_stone(void) { } if (!(gPlayerStatus.animFlags & (PA_FLAG_SPEECH_PROMPT_AVAILABLE | PA_FLAG_INTERACT_PROMPT_AVAILABLE))) { - dma_copy(E21870_ROM_START, E21870_ROM_END, E21870_VRAM_DEF); + dma_copy(pulse_stone_ROM_START, pulse_stone_ROM_END, pulse_stone_VRAM_DEF); PulseStoneNotificationCallback = func_802B7140; } } @@ -1085,7 +1091,7 @@ void check_for_conversation_prompt(void) { if (has_valid_conversation_npc()) { TalkNotificationCallback = NULL; - dma_copy(E20EB0_ROM_START, E20EB0_ROM_END, E20EB0_VRAM_DEF); + dma_copy(speech_bubble_ROM_START, speech_bubble_ROM_END, speech_bubble_VRAM_DEF); TalkNotificationCallback = func_802B70B4_E201C4; } else { TalkNotificationCallback = NULL; @@ -1253,7 +1259,7 @@ void check_for_interactables(void) { } if (InteractNotificationCallback == NULL) { - dma_copy(E20110_ROM_START, E20110_ROM_END, E20110_VRAM_DEF); + dma_copy(inspect_icon_ROM_START, inspect_icon_ROM_END, inspect_icon_VRAM_DEF); InteractNotificationCallback = func_802B70B4_E201C4; } diff --git a/src/7E9D0.c b/src/7E9D0.c index 225cec2a20..62c86bc181 100644 --- a/src/7E9D0.c +++ b/src/7E9D0.c @@ -5,6 +5,14 @@ #include "world/actions.h" #include "npc.h" #include "effects.h" +#include "ld_addrs.h" + +#ifdef SHIFT +// TODO same address as all world actions - picked the first one +#define PLAYER_ACTION_VRAM_DEF world_action_idle_VRAM +#else +#define PLAYER_ACTION_VRAM_DEF (void*) 0x802B6000 +#endif extern void* D_8010C924; extern s32 D_8010C964; @@ -270,7 +278,7 @@ void phys_update_action_state(void) { if (dmaStart != NULL && dmaStart != D_8010C924) { D_8010C924 = dmaStart; - dma_copy(dmaStart, PlayerActionsTable[playerStatus->actionState].dmaEnd, (void* )0x802B6000); // TODO shiftability fix + dma_copy(dmaStart, PlayerActionsTable[playerStatus->actionState].dmaEnd, PLAYER_ACTION_VRAM_DEF); } } PlayerActionsTable[playerStatus->actionState].update(); @@ -294,8 +302,7 @@ void phys_peach_update(void) { if (action->dmaStart != NULL && action->dmaStart != D_8010C924) { D_8010C924 = action->dmaStart; - // TODO: This needs to be a defined linker define for full shiftability - dma_copy(D_8010C924, PlayerActionsTable[playerStatus->actionState].dmaEnd, (void* )0x802B6000); // TODO shiftability fix + dma_copy(D_8010C924, PlayerActionsTable[playerStatus->actionState].dmaEnd, PLAYER_ACTION_VRAM_DEF); } if (PlayerActionsTable[playerStatus->actionState].flag) { diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index 266bac1602..b7531ac50b 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -7,13 +7,16 @@ #include "effects.h" #include "nu/nusys.h" -#ifdef SHIFT_VRAM +#ifdef SHIFT +#define MODEL_TEXTURE_BASE_ADDRESS 0x8028E000 // TODO shiftability +#define BATTLE_ENTITY_HEAP_BASE 0x80267FF0 // TODO shiftability #define AREA_SPECIFIC_ENTITY_VRAM entity_default_VRAM +#define BATTLE_ENTITY_HEAP_BOTTOM 0x80250000 // TODO shiftability #else -#define MODEL_TEXTURE_BASE_ADDRESS 0x8028E000 // TODO shiftability fix -#define BATTLE_ENTITY_HEAP_BASE 0x80267FF0 // TODO shiftability fix +#define MODEL_TEXTURE_BASE_ADDRESS 0x8028E000 +#define BATTLE_ENTITY_HEAP_BASE 0x80267FF0 #define AREA_SPECIFIC_ENTITY_VRAM 0x802BAE00 -#define BATTLE_ENTITY_HEAP_BOTTOM 0x80250000 // TODO shiftability fix +#define BATTLE_ENTITY_HEAP_BOTTOM 0x80250000 #endif typedef struct Fog { diff --git a/src/battle/area_kzn2/actor/lava_bud.c b/src/battle/area_kzn2/actor/lava_bud.c index d0952f0716..4216be5cd3 100644 --- a/src/battle/area_kzn2/actor/lava_bud.c +++ b/src/battle/area_kzn2/actor/lava_bud.c @@ -4,6 +4,7 @@ #include "sprite/npc/LavaBud.h" #include "sprite/npc/PetitPiranha.h" #include "effects.h" +#include "ld_addrs.h" #define NAMESPACE b_area_kzn2_lava_bud @@ -35,11 +36,8 @@ enum { VINE_2 = 2, }; -// TODO shiftability fix -enum { - VINE_1_BASE = 0x80231000, - VINE_2_BASE = 0x8022E000, -}; +#define VINE_1_BASE AUX_DATA_ADDR_1 +#define VINE_2_BASE AUX_DATA_ADDR_2 s32 N(idleAnimations)[] = { STATUS_NORMAL, ANIM_LavaBud_Anim03, diff --git a/src/battle/area_kzn2/actor/lava_piranha.c b/src/battle/area_kzn2/actor/lava_piranha.c index f9e67dde90..c5d1a4d474 100644 --- a/src/battle/area_kzn2/actor/lava_piranha.c +++ b/src/battle/area_kzn2/actor/lava_piranha.c @@ -8,6 +8,7 @@ #include "effects.h" #include "animation_script.h" #include "entity.h" +#include "ld_addrs.h" #define NAMESPACE b_area_kzn2_lava_piranha @@ -278,13 +279,10 @@ enum { VINE_4 = 4, }; -// TODO shiftability fix -enum { - VINE_0_BASE = 0x80234000, - VINE_1_BASE = 0x80231000, - VINE_2_BASE = 0x8022E000, - VINE_3_BASE = 0x8022C000, -}; +#define VINE_0_BASE AUX_DATA_ADDR_0 +#define VINE_1_BASE AUX_DATA_ADDR_1 +#define VINE_2_BASE AUX_DATA_ADDR_2 +#define VINE_3_BASE AUX_DATA_ADDR_3 BSS LavaPiranhaVine N(VineData)[NUM_VINES]; BSS s32 N(VineRenderState); diff --git a/src/battle/battle.h b/src/battle/battle.h index db50cb66b8..87094f8f75 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -408,4 +408,16 @@ void func_80072BCC(s32 arg0); void load_demo_battle(u32 index); Actor* create_actor(Formation formation); +#ifdef SHIFT +#define AUX_DATA_ADDR_0 world_model_anim_kzn_01_VRAM // (picked the first overlay among those with this address) +#define AUX_DATA_ADDR_1 battle_area_omo2_1_VRAM // (picked the first overlay among those with this address) +#define AUX_DATA_ADDR_2 0x8022E000 // TODO shiftability +#define AUX_DATA_ADDR_3 0x8022C000 // TODO shiftability +#else +#define AUX_DATA_ADDR_0 0x80234000 +#define AUX_DATA_ADDR_1 0x80231000 +#define AUX_DATA_ADDR_2 0x8022E000 +#define AUX_DATA_ADDR_3 0x8022C000 +#endif + #endif diff --git a/src/316d90.c b/src/battle_heap_create_obfuscated.c similarity index 86% rename from src/316d90.c rename to src/battle_heap_create_obfuscated.c index 095233ec04..04ca4d70a2 100644 --- a/src/316d90.c +++ b/src/battle_heap_create_obfuscated.c @@ -6,11 +6,11 @@ extern s32 obfuscated_battle_heap_create[]; #ifdef SHIFT -void func_802AE000(void) { +void battle_heap_create_obfuscated(void) { battle_heap_create(); } #else -void func_802AE000(void) { +void battle_heap_create_obfuscated(void) { s32(*readFunc)(OSPiHandle*, u32, u32*) = osEPiReadIo; s32 seed = 0x33F50000; s32 (*battle_heap_create)(void) = (s32 (*) (void)) obfuscated_battle_heap_create; @@ -24,7 +24,7 @@ void func_802AE000(void) { prevInsn = 0; - for (it = (u32*) _316C00_ROM_START; it < (u32*) _316C00_ROM_END; it++) { + for (it = (u32*) general_heap_create_obfuscated_ROM_START; it < (u32*) general_heap_create_obfuscated_ROM_END; it++) { readFunc(nuPiCartHandle, (u32) it, &thisInsn); hash += LOWER(thisInsn) + UPPER(thisInsn); diff --git a/src/3169f0.c b/src/create_audio_system_obfuscated.c similarity index 82% rename from src/3169f0.c rename to src/create_audio_system_obfuscated.c index 03cf4b82db..b4f8046b76 100644 --- a/src/3169f0.c +++ b/src/create_audio_system_obfuscated.c @@ -4,11 +4,11 @@ extern u8 obfuscated_create_audio_system[]; #ifdef SHIFT void create_audio_system(void); -void func_80200000(void) { +void create_audio_system_obfuscated(void) { create_audio_system(); } #else -void func_80200000(void) { +void create_audio_system_obfuscated(void) { u32 t0 = 0xAC29007B; u32 t1 = 0xB00006A8; void (*create_audio_system)(void) = (void (*)(void)) obfuscated_create_audio_system; diff --git a/src/316C00.c b/src/general_heap_create_obfuscated.c similarity index 88% rename from src/316C00.c rename to src/general_heap_create_obfuscated.c index 35915d0c05..a4b3aa1f21 100644 --- a/src/316C00.c +++ b/src/general_heap_create_obfuscated.c @@ -6,11 +6,11 @@ extern u8 obfuscated_general_heap_create[]; #ifdef SHIFT -void func_802AE000_316C00(void) { +void general_heap_create_obfuscated(void) { general_heap_create(); } #else -void func_802AE000_316C00(void) { +void general_heap_create_obfuscated(void) { s32(*readFunc)(OSPiHandle*, u32, u32*) = osEPiReadIo; s32 seed = 0x3C016C07 + 0xFEFEFEF; HeapNode*(*general_heap_create)(void) = (HeapNode* (*)(void)) obfuscated_general_heap_create; // general_heap_create - 0xFEFEFEF @@ -24,7 +24,7 @@ void func_802AE000_316C00(void) { prevInsn = 0; - for (it = (u32*) _316A70_ROM_START; it < (u32*) _316A70_ROM_END; it++) { + for (it = (u32*) load_engine_data_obfuscated_ROM_START; it < (u32*) load_engine_data_obfuscated_ROM_END; it++) { readFunc(nuPiCartHandle, (u32) it, &thisInsn); hash += LOWER(thisInsn) + UPPER(thisInsn); diff --git a/src/E225B0.c b/src/i_spy.c similarity index 100% rename from src/E225B0.c rename to src/i_spy.c diff --git a/src/E20110.c b/src/inspect_icon.c similarity index 97% rename from src/E20110.c rename to src/inspect_icon.c index e02cb83c46..5c5993b755 100644 --- a/src/E20110.c +++ b/src/inspect_icon.c @@ -1,8 +1,8 @@ #include "common.h" -#define NAMESPACE E20110 +#define NAMESPACE inspect_icon -typedef struct TempE20110 { +typedef struct InspectIconData { /* 0x00 */ Vec3f pos; /* 0x0C */ f32 unk_0C; /* 0x10 */ f32 scale; @@ -15,16 +15,16 @@ typedef struct TempE20110 { /* 0x23 */ u8 unk_23; /* 0x24 */ u8 unk_24; /* 0x25 */ char unk_25[0x3]; -} TempE20110; // size = 0x28 +} InspectIconData; // size = 0x28 -BSS TempE20110 D_802B7DA0; +BSS InspectIconData D_802B7DA0; #include "inspect_icon.png.h" #include "inspect_icon.png.inc.c" #include "inspect_icon.pal.inc.c" #include "inspect_icon_dlist.gfx.inc.c" -TempE20110* D_802B7CB8_E20DC8 = &D_802B7DA0; +InspectIconData* D_802B7CB8_E20DC8 = &D_802B7DA0; #include "common/UnkAngleFunc1.inc.c" @@ -212,7 +212,7 @@ void func_802B7728_E20838(void) { scale -= 360.0f; } D_802B7CB8_E20DC8->unk_0C = scale; - var_s0 = E20110_UnkAngleFunc1(scale); + var_s0 = N(UnkAngleFunc1)(scale); break; case 3: scale = D_802B7CB8_E20DC8->unk_0C; @@ -228,7 +228,7 @@ void func_802B7728_E20838(void) { if ((scale >= 70.0f && scale <= 110.0f) || (scale >= 250.0f && scale <= 290.0f)) { InteractNotificationCallback = func_802B79C8_E20AD8; } - var_s0 = E20110_UnkAngleFunc1(scale); + var_s0 = N(UnkAngleFunc1)(scale); break; } D_802B7CB8_E20DC8->unk_24 = var_s0; diff --git a/src/316a70.c b/src/load_engine_data_obfuscated.c similarity index 85% rename from src/316a70.c rename to src/load_engine_data_obfuscated.c index 92ab55f15c..9ef46400c7 100644 --- a/src/316a70.c +++ b/src/load_engine_data_obfuscated.c @@ -6,11 +6,11 @@ extern u8 obfuscated_load_engine_data[]; #ifdef SHIFT void load_engine_data(void); -void func_80200080(void) { +void load_engine_data_obfuscated(void) { load_engine_data(); } #else -void func_80200080(void) { +void load_engine_data_obfuscated(void) { s32 seed = 0x3C01A775; u32 thisInsn = 0xB0018FFC; HeapNode*(*load_engine_data)(void) = (HeapNode* (*)(void)) obfuscated_load_engine_data; // load_engine_data - ???????? @@ -23,7 +23,7 @@ void func_80200080(void) { prevInsn = 0; - for (it = (u32*) _3169F0_ROM_START; it < (u32*) _3169F0_ROM_END; it++) { + for (it = (u32*) create_audio_system_obfuscated_ROM_START; it < (u32*) create_audio_system_obfuscated_ROM_END; it++) { while (IO_READ(PI_STATUS_REG) & (PI_STATUS_DMA_BUSY | PI_STATUS_IO_BUSY)); thisInsn = IO_READ(it + 0x4000000); // ??? diff --git a/src/8560.c b/src/load_obfuscation_shims.c similarity index 74% rename from src/8560.c rename to src/load_obfuscation_shims.c index b0aaff3e47..8566b6849b 100644 --- a/src/8560.c +++ b/src/load_obfuscation_shims.c @@ -3,19 +3,19 @@ #include "ld_addrs.h" #include "mips.h" -extern s8 obfuscated__316F30_ROM_START[]; -extern s8 obfuscated__316F30_VRAM[]; +extern s8 obfuscated_obfuscation_shims_ROM_START[]; +extern s8 obfuscated_obfuscation_shims_VRAM[]; #ifdef SHIFT -void func_8002D160(void) { - dma_copy(_316F30_ROM_START, _316F30_ROM_END, _316F30_VRAM); +void load_obfuscation_shims(void) { + dma_copy(obfuscation_shims_ROM_START, obfuscation_shims_ROM_END, obfuscation_shims_VRAM); } #else -void func_8002D160(void) { +void load_obfuscation_shims(void) { s32 (*readFunc)(OSPiHandle*, u32, u32*); s32 (*readFunc2)(OSPiHandle*, u32, u32*); - s8* vramDest = obfuscated__316F30_VRAM; - s8* romStart = obfuscated__316F30_ROM_START; + s8* vramDest = obfuscated_obfuscation_shims_VRAM; + s8* romStart = obfuscated_obfuscation_shims_ROM_START; s32 seed; u32 hash; u32 thisInsn; @@ -31,7 +31,7 @@ void func_8002D160(void) { seed -= thisInsn; prevInsn = 0; - for (it = _316D90_ROM_START; it < _316D90_ROM_END; it += 4) { + for (it = battle_heap_create_obfuscated_ROM_START; it < battle_heap_create_obfuscated_ROM_END; it += 4) { readFunc(nuPiCartHandle, (u32)it, &thisInsn); hash += LOWER(thisInsn) + UPPER(thisInsn); @@ -58,7 +58,7 @@ void func_8002D160(void) { seed -= thisInsn2; prevInsn = 0; - for (it = _316F30_ROM_START; it < _316F30_ROM_END; it += 4) { + for (it = obfuscation_shims_ROM_START; it < obfuscation_shims_ROM_END; it += 4) { readFunc2(nuPiCartHandle, (u32)it, &thisInsn2); hash += LOWER(thisInsn2) + UPPER(thisInsn2); @@ -76,6 +76,6 @@ void func_8002D160(void) { } romStart += seed + 0xED41C - hash; - dma_copy(romStart, _316F30_ROM_END, vramDest); + dma_copy(romStart, obfuscation_shims_ROM_END, vramDest); } #endif diff --git a/src/main.c b/src/main.c index da3c03b54f..1d78d22de5 100644 --- a/src/main.c +++ b/src/main.c @@ -56,13 +56,13 @@ void boot_main(void* data) { nuGfxInit(); gGameStatusPtr->contBitPattern = nuContInit(); #ifdef VERSION_US - func_8002D160(); - func_802B2000(); - func_802B203C(); + load_obfuscation_shims(); + shim_create_audio_system_obfuscated(); + shim_load_engine_data_obfuscated(); #else func_8002CA00(); - func_802B2000(); - func_802B203C(); + shim_create_audio_system_obfuscated(); + shim_load_engine_data_obfuscated(); #endif nuGfxFuncSet((NUGfxFunc) gfxRetrace_Callback); nuGfxPreNMIFuncSet(gfxPreNMI_Callback); diff --git a/src/msg.c b/src/msg.c index cbd90893ac..dc7eec5b8b 100644 --- a/src/msg.c +++ b/src/msg.c @@ -16,8 +16,6 @@ enum RewindArrowStates { typedef MessageImageData* MessageImageDataList[1]; -extern IMG_BIN D_802EF0D0; - s32 D_8014C280[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, }; u8 MessagePlural[] = { MSG_CHAR_LOWER_S, MSG_CHAR_READ_END }; @@ -51,16 +49,72 @@ Gfx D_8014C2D8[] = { gsSPEndDisplayList(), }; +// unsorted +extern s32 D_8015131C; +extern MessageDrawState D_80155D20; +extern IMG_BIN D_80159B50[]; +extern PAL_BIN D_8015C7E0[]; + +// BSS +extern s32 gMsgBGScrollAmtX; +extern u16 gMsgGlobalWaveCounter; +extern MessageImageDataList gMsgVarImages; +extern s32 gMsgBGScrollAmtY; +extern Gfx* D_80151338; +extern char gMessageBuffers[][1024]; +extern u8 gMessageMsgVars[3][32]; +extern s16 D_80155C98; +extern Mtx gMessageWindowProjMatrix[2]; +extern MessageDrawState* msg_drawState; + +extern s16 D_802EB644[22]; + +extern IMG_BIN ui_msg_bubble_left_png[]; +extern IMG_BIN ui_msg_bubble_mid_png[]; +extern IMG_BIN ui_msg_bubble_right_png[]; +extern IMG_BIN ui_msg_arrow_png[]; +extern unsigned char ui_msg_palettes[16][32]; +extern IMG_BIN ui_msg_sign_corner_topleft_png[]; +extern IMG_BIN ui_msg_sign_corner_topright_png[]; +extern IMG_BIN ui_msg_sign_corner_bottomleft_png[]; +extern IMG_BIN ui_msg_sign_corner_bottomright_png[]; +extern IMG_BIN ui_msg_lamppost_corner_bottomright_png[]; +extern IMG_BIN ui_msg_sign_side_top_png[]; +extern IMG_BIN ui_msg_sign_side_left_png[]; +extern IMG_BIN ui_msg_sign_side_right_png[]; +extern IMG_BIN ui_msg_sign_side_bottom_png[]; +extern IMG_BIN ui_msg_sign_fill_png[]; +extern PAL_BIN ui_msg_sign_pal[]; +extern PAL_BIN ui_msg_lamppost_pal[]; +extern IMG_BIN ui_msg_background_png[]; +extern IMG_BIN ui_msg_rewind_arrow_png[]; +extern PAL_BIN ui_msg_rewind_arrow_pal[]; +extern IMG_BIN ui_msg_star_png[]; +extern IMG_BIN ui_msg_star_silhouette_png[]; + +extern IMG_BIN D_802ED550[]; +extern PAL_BIN D_802ED670[]; +extern IMG_BIN D_802ED970[]; +extern IMG_BIN D_802EE8D0[]; +extern MessageCharset* gMsgCharsets[5]; +extern IMG_BIN D_802F39D0[]; +extern PAL_BIN D_802F4560[80][8]; + +extern s32 gMessageBoxFrameParts[2][16]; + +extern IMG_BIN ui_point_right_png[]; +extern PAL_BIN ui_point_right_pal[]; + MessageNumber gMsgNumbers[] = { { - .rasters = &D_802EF0D0, + .rasters = &D_802EE8D0[0x800], .texSize = 128, .texWidth = 16, .texHeight = 16, .digitWidth = {11, 8, 11, 11, 11, 11, 11, 11, 11, 11}, .fixedWidth = 11 }, { - .rasters = &D_802EF0D0, + .rasters = &D_802EE8D0[0x800], .texSize = 128, .texWidth = 16, .texHeight = 16, @@ -140,62 +194,6 @@ Gfx D_8014C500[] = { u8 D_8014C580[] = { 50, 80, 100, 105, 100, 0, 0, 0 }; u8 D_8014C588[] = { 105, 100, 77, 57, 40, 27, 16, 8, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -// unsorted -extern s32 D_8015131C; -extern MessageDrawState D_80155D20; -extern IMG_BIN D_80159B50[]; -extern PAL_BIN D_8015C7E0[]; - -// BSS -extern s32 gMsgBGScrollAmtX; -extern u16 gMsgGlobalWaveCounter; -extern MessageImageDataList gMsgVarImages; -extern s32 gMsgBGScrollAmtY; -extern Gfx* D_80151338; -extern char gMessageBuffers[][1024]; -extern u8 gMessageMsgVars[3][32]; -extern s16 D_80155C98; -extern Mtx gMessageWindowProjMatrix[2]; -extern MessageDrawState* msg_drawState; - -extern s16 D_802EB644[22]; - -extern IMG_BIN ui_msg_bubble_left_png[]; -extern IMG_BIN ui_msg_bubble_mid_png[]; -extern IMG_BIN ui_msg_bubble_right_png[]; -extern IMG_BIN ui_msg_arrow_png[]; -extern unsigned char ui_msg_palettes[16][32]; -extern IMG_BIN ui_msg_sign_corner_topleft_png[]; -extern IMG_BIN ui_msg_sign_corner_topright_png[]; -extern IMG_BIN ui_msg_sign_corner_bottomleft_png[]; -extern IMG_BIN ui_msg_sign_corner_bottomright_png[]; -extern IMG_BIN ui_msg_lamppost_corner_bottomright_png[]; -extern IMG_BIN ui_msg_sign_side_top_png[]; -extern IMG_BIN ui_msg_sign_side_left_png[]; -extern IMG_BIN ui_msg_sign_side_right_png[]; -extern IMG_BIN ui_msg_sign_side_bottom_png[]; -extern IMG_BIN ui_msg_sign_fill_png[]; -extern PAL_BIN ui_msg_sign_pal[]; -extern PAL_BIN ui_msg_lamppost_pal[]; -extern IMG_BIN ui_msg_background_png[]; -extern IMG_BIN ui_msg_rewind_arrow_png[]; -extern PAL_BIN ui_msg_rewind_arrow_pal[]; -extern IMG_BIN ui_msg_star_png[]; -extern IMG_BIN ui_msg_star_silhouette_png[]; - -extern IMG_BIN D_802ED550[]; -extern PAL_BIN D_802ED670[]; -extern IMG_BIN D_802ED970[]; -extern IMG_BIN D_802EE8D0[]; -extern MessageCharset* gMsgCharsets[5]; -extern IMG_BIN D_802F39D0[]; -extern PAL_BIN D_802F4560[80][8]; - -extern s32 gMessageBoxFrameParts[2][16]; - -extern IMG_BIN ui_point_right_png[]; -extern PAL_BIN ui_point_right_pal[]; - s32 draw_image_with_clipping(IMG_PTR raster, s32 width, s32 height, s32 fmt, s32 bitDepth, s16 posX, s16 posY, u16 clipULx, u16 clipULy, u16 clipLRx, u16 clipRLy); diff --git a/src/obfuscation_shims.c b/src/obfuscation_shims.c new file mode 100644 index 0000000000..6ab9898326 --- /dev/null +++ b/src/obfuscation_shims.c @@ -0,0 +1,43 @@ +#include "common.h" +#include "ld_addrs.h" + +void create_audio_system_obfuscated(void); +void load_engine_data_obfuscated(void); +void general_heap_create_obfuscated(void); +void battle_heap_create_obfuscated(void); + +void shim_create_audio_system_obfuscated(void) { + dma_copy( + create_audio_system_obfuscated_ROM_START, + create_audio_system_obfuscated_ROM_END, + create_audio_system_obfuscated_VRAM + ); + create_audio_system_obfuscated(); +} + +void shim_load_engine_data_obfuscated(void) { + dma_copy( + load_engine_data_obfuscated_ROM_START, + load_engine_data_obfuscated_ROM_END, + load_engine_data_obfuscated_VRAM + ); + load_engine_data_obfuscated(); +} + +void shim_general_heap_create_obfuscated(void) { + dma_copy( + general_heap_create_obfuscated_ROM_START, + general_heap_create_obfuscated_ROM_END, + general_heap_create_obfuscated_VRAM + ); + general_heap_create_obfuscated(); +} + +void shim_battle_heap_create_obfuscated(void) { + dma_copy( + battle_heap_create_obfuscated_ROM_START, + battle_heap_create_obfuscated_ROM_END, + battle_heap_create_obfuscated_VRAM + ); + battle_heap_create_obfuscated(); +} diff --git a/src/E21870.c b/src/pulse_stone.c similarity index 97% rename from src/E21870.c rename to src/pulse_stone.c index e4a7dd59e1..452e030a6e 100644 --- a/src/E21870.c +++ b/src/pulse_stone.c @@ -1,6 +1,6 @@ #include "common.h" -typedef struct TempE21870 { +typedef struct PulseStoneData { /* 0x00 */ Vec3f pos; /* 0x0C */ f32 scale; /* 0x10 */ char unk_10[0x8]; @@ -8,9 +8,9 @@ typedef struct TempE21870 { /* 0x1C */ char unk_1C[0x4]; /* 0x20 */ s32 unk_20; /* 0x24 */ s32 unk_24; -} TempE21870; // size = 0x28 +} PulseStoneData; // size = 0x28 -BSS TempE21870 D_802B7D40; +BSS PulseStoneData D_802B7D40; #include "pulse_stone.png.h" #include "pulse_stone.png.inc.c" @@ -18,7 +18,7 @@ BSS TempE21870 D_802B7D40; #include "pulse_stone.flash.pal.inc.c" #include "pulse_stone_dlist.gfx.inc.c" -TempE21870* D_802B7D18_E22588 = &D_802B7D40; +PulseStoneData* D_802B7D18_E22588 = &D_802B7D40; void func_802B74F0(void); diff --git a/src/e20eb0.c b/src/speech_bubble.c similarity index 94% rename from src/e20eb0.c rename to src/speech_bubble.c index 87bb31fa71..15e7bd9049 100644 --- a/src/e20eb0.c +++ b/src/speech_bubble.c @@ -1,12 +1,12 @@ #include "common.h" -#define NAMESPACE e20eb0 +#define NAMESPACE speech_bubble #include "common/UnkAngleFunc1.inc.c" #include "speech_bubble.png.h" -typedef struct UnkE20EB0 { +typedef struct SpeechBubbleData { /* 0x00 */ Npc* unk_00; /* 0x04 */ Vec3f pos; /* 0x10 */ f32 unk_10; @@ -17,21 +17,21 @@ typedef struct UnkE20EB0 { /* 0x24 */ char unk_24[6]; /* 0x2A */ u8 unk_2A; /* 0x2B */ u8 unk_2B; -} UnkE20EB0; /* size = 0x2C */ +} SpeechBubbleData; /* size = 0x2C */ -BSS UnkE20EB0 D_802B79C0_E21870; +BSS SpeechBubbleData D_802B79C0_E21870; #include "speech_bubble.png.inc.c" #include "speech_bubble.pal.inc.c" #include "speech_bubble_dlist.gfx.inc.c" -UnkE20EB0* D_802B79A8_E21858 = &D_802B79C0_E21870; +SpeechBubbleData* D_802B79A8_E21858 = &D_802B79C0_E21870; void func_802B742C(void); void func_802B70B4(void) { PlayerStatus* playerStatus = &gPlayerStatus; - UnkE20EB0* temp; + SpeechBubbleData* temp; Npc* npc; mem_clear(D_802B79A8_E21858, sizeof(*D_802B79A8_E21858)); @@ -125,7 +125,7 @@ void func_802B742C(void) { unk10 -= 360.0f; } D_802B79A8_E21858->unk_10 = unk10; - var_a2 = e20eb0_UnkAngleFunc1(unk10); + var_a2 = N(UnkAngleFunc1)(unk10); break; case 3: unk10 = D_802B79A8_E21858->unk_10; @@ -140,7 +140,7 @@ void func_802B742C(void) { playerStatus->animFlags &= ~PA_FLAG_SPEECH_PROMPT_AVAILABLE; return; } - var_a2 = e20eb0_UnkAngleFunc1(unk10); + var_a2 = N(UnkAngleFunc1)(unk10); break; } diff --git a/src/state_battle.c b/src/state_battle.c index 0f266af207..f73a5916cd 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -47,8 +47,8 @@ void state_step_battle(void) { func_8003B1A8(); gGameStatusPtr->isBattle = TRUE; backup_map_collision_data(); - func_8002D160(); - func_802B20B4(); + load_obfuscation_shims(); + shim_battle_heap_create_obfuscated(); sfx_clear_env_sounds(0); currentBattleSelection = UNPACK_BTL_AREA(gCurrentBattleID); @@ -76,7 +76,7 @@ void state_step_battle(void) { clear_npcs(); clear_entity_data(1); clear_trigger_data(); - dma_copy(_16C8E0_ROM_START, _16C8E0_ROM_END, _16C8E0_VRAM); + dma_copy(battle_code_ROM_START, battle_code_ROM_END, battle_code_VRAM); initialize_battle(); btl_save_world_cameras(); load_battle_section(); diff --git a/src/state_pause.c b/src/state_pause.c index 4824169950..413aca830e 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -28,6 +28,8 @@ void state_init_pause(void) { set_windows_visible(WINDOW_GROUP_PAUSE_MENU); } +extern Addr D_80200000; + void state_step_pause(void) { s32 oldIsBattle = D_800A0921; @@ -70,7 +72,7 @@ void state_step_pause(void) { clear_entity_models(); clear_animator_list(); clear_worker_list(); - hud_element_set_aux_cache(_3169F0_VRAM, 0x38000); + hud_element_set_aux_cache(D_80200000, 0x38000); // TODO shiftability (what should this symbol be?) hud_element_clear_cache(); reset_status_menu(); clear_item_entity_data(); diff --git a/src/world/area_sbk/sbk_14/sbk_14_2_entity.c b/src/world/area_sbk/sbk_14/sbk_14_2_entity.c index 7565c780a5..093a27cc94 100644 --- a/src/world/area_sbk/sbk_14/sbk_14_2_entity.c +++ b/src/world/area_sbk/sbk_14/sbk_14_2_entity.c @@ -1,16 +1,16 @@ #include "sbk_14.h" #include "entity.h" -TweesterPath N(D_80240440_936B20)[] = { - { -65, 0, 217 }, - { -262, 0, -64 }, - { 57, 0, -286 }, - { 327, 0, 8 }, - { TWEESTER_PATH_LOOP } +TweesterPath N(D_80240440_936B20) = { + -65, 0, 217, + -262, 0, -64, + 57, 0, -286, + 327, 0, 8, + TWEESTER_PATH_LOOP }; TweesterPath* N(D_80240474_936B54)[] = { - N(D_80240440_936B20), + &N(D_80240440_936B20), PTR_LIST_END }; diff --git a/src/world/area_sbk/sbk_23/sbk_23_2_entity.c b/src/world/area_sbk/sbk_23/sbk_23_2_entity.c index 26d560760f..273788a4b8 100644 --- a/src/world/area_sbk/sbk_23/sbk_23_2_entity.c +++ b/src/world/area_sbk/sbk_23/sbk_23_2_entity.c @@ -1,16 +1,16 @@ #include "sbk_23.h" #include "entity.h" -TweesterPath N(D_802403C0_93AB20)[] = { - { -65, 0, 217 }, - { -262, 0, -64 }, - { 57, 0, -286 }, - { 327, 0, 8 }, - { TWEESTER_PATH_LOOP } +TweesterPath N(D_802403C0_93AB20) = { + -65, 0, 217, + -262, 0, -64, + 57, 0, -286, + 327, 0, 8, + TWEESTER_PATH_LOOP }; TweesterPath* N(D_802403F4_93AB54)[] = { - N(D_802403C0_93AB20), + &N(D_802403C0_93AB20), PTR_LIST_END }; diff --git a/src/world/area_sbk/sbk_33/sbk_33_1_entity.c b/src/world/area_sbk/sbk_33/sbk_33_1_entity.c index 48252403ec..e6260b6712 100644 --- a/src/world/area_sbk/sbk_33/sbk_33_1_entity.c +++ b/src/world/area_sbk/sbk_33/sbk_33_1_entity.c @@ -1,16 +1,16 @@ #include "sbk_33.h" #include "entity.h" -TweesterPath N(DefaultTweesterPath)[] = { - { -65, 0, 217 }, - { -262, 0, -64 }, - { 57, 0, -286 }, - { 327, 0, 8 }, - { TWEESTER_PATH_LOOP } +TweesterPath N(DefaultTweesterPath) = { + -65, 0, 217, + -262, 0, -64, + 57, 0, -286, + 327, 0, 8, + TWEESTER_PATH_LOOP }; TweesterPath* N(TweesterPaths)[] = { - N(DefaultTweesterPath), + &N(DefaultTweesterPath), PTR_LIST_END }; diff --git a/src/world/area_sbk/sbk_41/sbk_41_2_entity.c b/src/world/area_sbk/sbk_41/sbk_41_2_entity.c index 4fe5a4a7f3..9a6a6f6486 100644 --- a/src/world/area_sbk/sbk_41/sbk_41_2_entity.c +++ b/src/world/area_sbk/sbk_41/sbk_41_2_entity.c @@ -1,16 +1,16 @@ #include "sbk_41.h" #include "entity.h" -TweesterPath N(DefaultTweesterPath)[] = { - { -65, 0, 217 }, - { -262, 0, -64 }, - { 57, 0, -286 }, - { 327, 0, 8 }, - { TWEESTER_PATH_LOOP } +TweesterPath N(DefaultTweesterPath) = { + -65, 0, 217, + -262, 0, -64, + 57, 0, -286, + 327, 0, 8, + TWEESTER_PATH_LOOP }; TweesterPath* N(TweesterPaths)[] = { - N(DefaultTweesterPath), + &N(DefaultTweesterPath), PTR_LIST_END }; diff --git a/src/world/area_sbk/sbk_54/sbk_54_2_entity.c b/src/world/area_sbk/sbk_54/sbk_54_2_entity.c index 8f86d02a8a..ead4d9add3 100644 --- a/src/world/area_sbk/sbk_54/sbk_54_2_entity.c +++ b/src/world/area_sbk/sbk_54/sbk_54_2_entity.c @@ -1,16 +1,16 @@ #include "sbk_54.h" #include "entity.h" -TweesterPath N(TweesterPath1)[] = { - { -65, 0, 217 }, - { -262, 0, -64 }, - { 57, 0, -286 }, - { 327, 0, 8 }, - { TWEESTER_PATH_LOOP } +TweesterPath N(TweesterPath1) = { + -65, 0, 217, + -262, 0, -64, + 57, 0, -286, + 327, 0, 8, + TWEESTER_PATH_LOOP }; TweesterPath* N(TweesterPaths)[] = { - N(TweesterPath1), + &N(TweesterPath1), PTR_LIST_END }; diff --git a/src/world/area_tst/tst_10/tst_10_1_main.c b/src/world/area_tst/tst_10/tst_10_1_main.c index d883e1917f..8e70b468e0 100644 --- a/src/world/area_tst/tst_10/tst_10_1_main.c +++ b/src/world/area_tst/tst_10/tst_10_1_main.c @@ -103,19 +103,19 @@ EvtScript N(EVS_Main) = { EVT_END }; -TweesterPath N(DefaultTweesterPath)[] = { - { -65, 0, 217 }, - { -262, 0, -64 }, - { 57, 0, -286 }, - { 327, 0, 8 }, - { TWEESTER_PATH_LOOP } +TweesterPath N(DefaultTweesterPath) = { + -65, 0, 217, + -262, 0, -64, + 57, 0, -286, + 327, 0, 8, + TWEESTER_PATH_LOOP }; TweesterPath* N(UnusedTweesterPaths)[] = { - N(DefaultTweesterPath), - N(DefaultTweesterPath), - N(DefaultTweesterPath), - N(DefaultTweesterPath), + &N(DefaultTweesterPath), + &N(DefaultTweesterPath), + &N(DefaultTweesterPath), + &N(DefaultTweesterPath), PTR_LIST_END }; diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c index 9f904f72ed..c2aae53605 100644 --- a/src/world/partner/goombario.c +++ b/src/world/partner/goombario.c @@ -5,7 +5,7 @@ #include "message_ids.h" #include "entity.h" -typedef struct UnkE20EB0 { +typedef struct SpeechBubbleData { /* 0x00 */ Npc* unk_00; /* 0x04 */ Vec3f pos; /* 0x10 */ f32 unk_10; @@ -16,9 +16,9 @@ typedef struct UnkE20EB0 { /* 0x24 */ char unk_24[6]; /* 0x2A */ u8 unk_2A; /* 0x2B */ u8 unk_2B; -} UnkE20EB0; /* size = 0x2C */ +} SpeechBubbleData; /* size = 0x2C */ -extern UnkE20EB0* D_802B79A8_E21858; +extern SpeechBubbleData* D_802B79A8_E21858; BSS s32 D_802BDF30; BSS s32 D_802BDF34; diff --git a/src/world/partners.c b/src/world/partners.c index 07c3a50a47..01920b85b9 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -155,8 +155,8 @@ s32 D_800F7FF8 = 5; s32 D_800F7FFC = 7; s32 D_800F8000[] = { 8, 0, 0, 0 }; UseItemStruct UseItemDmaArgs = { - _3251D0_ROM_START, - _3251D0_ROM_END, + world_use_item_ROM_START, + world_use_item_ROM_END, &EVS_World_UseItem, 0 }; @@ -488,7 +488,7 @@ s32 use_consumable(s32 invSlot) { D_8010CD20 = invSlot; invSlot = gPlayerData.invItems[invSlot]; - dma_copy(UseItemDmaArgs.dmaStart, UseItemDmaArgs.dmaEnd, _3251D0_VRAM); + dma_copy(UseItemDmaArgs.dmaStart, UseItemDmaArgs.dmaEnd, world_use_item_VRAM); script = start_script(UseItemDmaArgs.script, EVT_PRIORITY_1, 0); script->varTable[10] = invSlot; return script->id; diff --git a/src/world/world.c b/src/world/world.c index fc736c2ba6..0980627a37 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -47,8 +47,8 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { gOverrideFlags &= ~GLOBAL_OVERRIDES_ENABLE_FLOOR_REFLECTION; gGameStatusPtr->playerSpriteSet = PLAYER_SPRITES_MARIO_WORLD; - func_8002D160(); - func_802B2078(); + load_obfuscation_shims(); + shim_general_heap_create_obfuscated(); clear_render_tasks(); clear_worker_list(); clear_script_list(); @@ -111,8 +111,8 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { load_map_bg(wMapBgName); } - func_8002D160(); - func_802B2078(); + load_obfuscation_shims(); + shim_general_heap_create_obfuscated(); sfx_clear_env_sounds(0); clear_worker_list(); clear_script_list(); diff --git a/tools/warnings_count/check_new_warnings.sh b/tools/warnings_count/check_new_warnings.sh index ceadf10b23..1117fd432f 100755 --- a/tools/warnings_count/check_new_warnings.sh +++ b/tools/warnings_count/check_new_warnings.sh @@ -21,6 +21,7 @@ then rm -rf ver/*/build/src ninja | grep warning | sort > tools/warnings_count/warnings_new.txt else + touch tools/warnings_count/warnings_new.txt cat build_log.txt | grep warning || [[ $? == 1 ]] | sort > tools/warnings_count/warnings_new.txt fi diff --git a/ver/jp/undefined_funcs_auto.txt b/ver/jp/undefined_funcs_auto.txt index e36f568457..8ffe637033 100644 --- a/ver/jp/undefined_funcs_auto.txt +++ b/ver/jp/undefined_funcs_auto.txt @@ -1,5 +1,5 @@ -func_802B2000 = 0x802B2000; -func_802B203C = 0x802B203C; +shim_create_audio_system_obfuscated = 0x802B2000; +shim_load_engine_data_obfuscated = 0x802B203C; func_80120CF8 = 0x80120CF8; func_80128614 = 0x80128614; func_8014A910 = 0x8014A910; diff --git a/ver/us/asm/data/world/area_jan/jan_01/B29400.data.s b/ver/us/asm/data/world/area_jan/jan_01/B29400.data.s index f405f1278e..6429a90491 100644 --- a/ver/us/asm/data/world/area_jan/jan_01/B29400.data.s +++ b/ver/us/asm/data/world/area_jan/jan_01/B29400.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802413D0_B29400 -.word 0xC425C000, 0xC1600000, 0x42540000, 0x42B40000, 0x4425C000, 0xC1800000, 0x42200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024160C, D_802413D0_B29400, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900EC, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC425C000, 0xC1600000, 0x42540000, 0x42B40000, 0x4425C000, 0xC1800000, 0x42200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024160C, D_802413D0_B29400, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900EC, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2ED90.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2ED90.data.s index 671931df97..91c671d1f7 100644 --- a/ver/us/asm/data/world/area_jan/jan_02/B2ED90.data.s +++ b/ver/us/asm/data/world/area_jan/jan_02/B2ED90.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242920_B2ED90 -.word 0xC3E10000, 0x00000000, 0xC3E10000, 0x43070000, 0x44200000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242BDC, D_80242920_B2ED90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900ED, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000001, func_80240000_B2C470, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC3E10000, 0x00000000, 0xC3E10000, 0x43070000, 0x44200000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242BDC, D_80242920_B2ED90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900ED, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000001, func_80240000_B2C470, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s b/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s index 10317a8774..04746995e4 100644 --- a/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s +++ b/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243290_B37E60 -.word 0xC411C000, 0x00000000, 0x00000000, 0x42B40000, 0xC3CA8000, 0x00000000, 0xC3CA8000, 0x43070000, 0x4411C000, 0x00000000, 0x00000000, 0x43870000, 0xC4070000, 0x420C0000, 0x43430000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802444F0_B390C0, D_80243290_B37E60, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900EE +.word 0xC411C000, 0x00000000, 0x00000000, 0x42B40000, 0xC3CA8000, 0x00000000, 0xC3CA8000, 0x43070000, 0x4411C000, 0x00000000, 0x00000000, 0x43870000, 0xC4070000, 0x420C0000, 0x43430000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802444F0_B390C0, D_80243290_B37E60, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900EE dlabel D_80243310_B37EE0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x0000000E, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000027, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B45860.data.s b/ver/us/asm/data/world/area_jan/jan_04/B45860.data.s index 8e2fd4922b..6b05878c25 100644 --- a/ver/us/asm/data/world/area_jan/jan_04/B45860.data.s +++ b/ver/us/asm/data/world/area_jan/jan_04/B45860.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802410F0_B45860 -.word 0xC3F18000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0xC2DC0000, 0xC1700000, 0x434C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802414C0, D_802410F0_B45860, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, jan_04_get_tattle, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000024, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3F18000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0xC2DC0000, 0xC1700000, 0x434C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802414C0, D_802410F0_B45860, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, jan_04_get_tattle, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000024, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s index d2985f0099..f54452aa2b 100644 --- a/ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s +++ b/ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802426D0_B4D140 -.word 0x43A50000, 0x00000000, 0x43A50000, 0x439D8000, 0xC3FA0000, 0xC1A00000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242A1C, D_802426D0_B4D140, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, jan_05_get_tattle, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x43A50000, 0x00000000, 0x43A50000, 0x439D8000, 0xC3FA0000, 0xC1A00000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242A1C, D_802426D0_B4D140, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, jan_05_get_tattle, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s b/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s index 469b3e4d46..0ca9831b50 100644 --- a/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s +++ b/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802425E0_B54E10 -.word 0x00000000, 0x00000000, 0x43EB0000, 0x00000000, 0x43EB0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3EB0000, 0x43340000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242C80_B554B0, D_802425E0_B54E10, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F8 +.word 0x00000000, 0x00000000, 0x43EB0000, 0x00000000, 0x43EB0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3EB0000, 0x43340000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242C80_B554B0, D_802425E0_B54E10, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F8 dlabel D_80242660_B54E90 .word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s index d30be7f316..7ffd44b1bc 100644 --- a/ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s +++ b/ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241220_B5AA90 -.word 0xC35C0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241338, D_80241220_B5AA90, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC35C0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241338, D_80241220_B5AA90, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s index 2c92ef197b..2319e05edd 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242430_B606E0 -.word 0xC3A50000, 0x00000000, 0x43A50000, 0x42340000, 0x43FA0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802426F4, D_80242430_B606E0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC3A50000, 0x00000000, 0x43A50000, 0x42340000, 0x43FA0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802426F4, D_80242430_B606E0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s index f89c82d08f..4bbb5d2df6 100644 --- a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241920_B673D0 -.word 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3F00000, 0xC1A00000, 0x00000000, 0x42B40000, 0xC3310000, 0x42FA0000, 0xC3D98000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802429C4_B68474, D_80241920_B673D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F5 +.word 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3F00000, 0xC1A00000, 0x00000000, 0x42B40000, 0xC3310000, 0x42FA0000, 0xC3D98000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802429C4_B68474, D_80241920_B673D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F5 dlabel D_802419A0_B67450 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_09_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_09_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s b/ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s index a339ed0c35..a0a1ee8bcf 100644 --- a/ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241740_B6DAD0 -.word 0x43BE0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802418F4, D_80241740_B6DAD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F6, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x43BE0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802418F4, D_80241740_B6DAD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F6, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s b/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s index 5345e1b62a..6cd98dd563 100644 --- a/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s +++ b/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241260_B74310 -.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802413C0_B74470, D_80241260_B74310, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FA +.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802413C0_B74470, D_80241260_B74310, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FA dlabel D_802412C0_B74370 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s b/ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s index 639ccced74..afc0444b8d 100644 --- a/ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s +++ b/ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802405D0_B76D80 -.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x425C0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240730_B76EE0, D_802405D0_B76D80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FB +.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x425C0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240730_B76EE0, D_802405D0_B76D80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FB dlabel D_80240630_B76DE0 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243870, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s b/ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s index 2c242cd309..a3cde316aa 100644 --- a/ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s +++ b/ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802412E0_B7B330 -.word 0xC37A0000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241440_B7B490, D_802412E0_B7B330, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FC +.word 0xC37A0000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241440_B7B490, D_802412E0_B7B330, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FC dlabel D_80241340_B7B390 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243860, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s b/ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s index 9fd1b0c234..30e663ff67 100644 --- a/ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s +++ b/ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240300_B7DC20 -.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x43BE0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240494_B7DDB4, D_80240300_B7DC20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FD +.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x43BE0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240494_B7DDB4, D_80240300_B7DC20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FD dlabel D_80240360_B7DC80 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000014, 0x00000043, 0x00000003, GotoMap, 0x802426D0, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802426D0, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s b/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s index d6e2bcb06d..68793be1e8 100644 --- a/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s +++ b/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240540_B80540 -.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3770000, 0x00000000, 0x00000000, 0x43610000, 0xC3C30000, 0x00000000, 0x41A00000, 0x42C80000, 0x420C0000, 0x44160000, 0x43A50000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241074_B81074, D_80240540_B80540, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900FE +.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3770000, 0x00000000, 0x00000000, 0x43610000, 0xC3C30000, 0x00000000, 0x41A00000, 0x42C80000, 0x420C0000, 0x44160000, 0x43A50000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241074_B81074, D_80240540_B80540, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FE dlabel D_802405D0_B805D0 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s b/ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s index bf7e1a49d2..92d9508f4a 100644 --- a/ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s +++ b/ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240000_B83B90 -.word 0x41C80000, 0x43340000, 0x434D0000, 0x432C0000, 0x41A00000, 0x43AC8000, 0xC3520000, 0x40C00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240180_B83D10, D_80240000_B83B90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190100 +.word 0x41C80000, 0x43340000, 0x434D0000, 0x432C0000, 0x41A00000, 0x43AC8000, 0xC3520000, 0x40C00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240180_B83D10, D_80240000_B83B90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190100 dlabel D_80240060_B83BF0 .word 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s index 8e1b16ff8a..ee2c599b9d 100644 --- a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241960_B85AE0 -.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0xC33E0000, 0x00000000, 0xC3020000, 0x43340000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802421B0_B86330, D_80241960_B85AE0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900EF +.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0xC33E0000, 0x00000000, 0xC3020000, 0x43340000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802421B0_B86330, D_80241960_B85AE0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900EF dlabel D_802419E0_B85B60 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000027, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000016, 0x00000017, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s b/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s index 88c8dfb672..a526b26ea1 100644 --- a/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240000_B8FCD0 -.word 0x43660000, 0x43200000, 0x42D40000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405E0_B902B0, D_80240000_B8FCD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190102 +.word 0x43660000, 0x43200000, 0x42D40000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405E0_B902B0, D_80240000_B8FCD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190102 dlabel D_80240050_B8FD20 .word 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s b/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s index 303a40e13d..e5a7ea57f8 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240330_AC9A40 -.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802406D0, D_80240330_AC9A40, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802406D0, D_80240330_AC9A40, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s b/ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s index 05a9e7f03f..63b82f0fc8 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_13/AD6630.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240760_AD6630 -.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x44A1E000, 0x00000000, 0x00000000, 0x43870000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240BF8, D_80240760_AD6630, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019000E, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x0000001B, 0x00000001, 0x0000005F, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x44A1E000, 0x00000000, 0x00000000, 0x43870000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240BF8, D_80240760_AD6630, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019000E, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x0000001B, 0x00000001, 0x0000005F, 0x0000000A, 0x00000002, 0xF8405D7A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s index bfa8497f34..e99d8305a6 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802404C0_ADB360 -.word 0xC3BB8000, 0x00000000, 0xC1F00000, 0x42B40000, 0x43D98000, 0x41F00000, 0xC2040000, 0x43870000, 0xC2F40000, 0x41200000, 0xC2A40000, 0x43340000, 0xC1A00000, 0x00000000, 0x41F00000, 0x43870000, 0xC30C0000, 0x00000000, 0x00000000, 0x43870000, 0x42200000, 0x00000000, 0x41F00000, 0x43340000, 0xC1A00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x41F00000, 0x43340000, 0xC3020000, 0x00000000, 0x00000000, 0x43340000, 0xC2700000, 0x00000000, 0x00000000, 0x43870000, 0x43BE0000, 0x41F00000, 0x41200000, 0x43870000, 0x43160000, 0x00000000, 0xC1F00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DA4, D_802404C0_ADB360, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019000F, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC3BB8000, 0x00000000, 0xC1F00000, 0x42B40000, 0x43D98000, 0x41F00000, 0xC2040000, 0x43870000, 0xC2F40000, 0x41200000, 0xC2A40000, 0x43340000, 0xC1A00000, 0x00000000, 0x41F00000, 0x43870000, 0xC30C0000, 0x00000000, 0x00000000, 0x43870000, 0x42200000, 0x00000000, 0x41F00000, 0x43340000, 0xC1A00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x41F00000, 0x43340000, 0xC3020000, 0x00000000, 0x00000000, 0x43340000, 0xC2700000, 0x00000000, 0x00000000, 0x43870000, 0x43BE0000, 0x41F00000, 0x41200000, 0x43870000, 0x43160000, 0x00000000, 0xC1F00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DA4, D_802404C0_ADB360, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019000F, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s index 7220fadb53..9fddf14b39 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_18/AF34C0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240820_AF34C0 -.word 0xC33B0000, 0x00000000, 0xC20C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DF0, D_80240820_AF34C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190013, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xC33B0000, 0x00000000, 0xC20C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DF0, D_80240820_AF34C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190013, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000006, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s b/ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s index 282bbf924b..a9b9441d46 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_22/B024F0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240000_B024F0 -.word 0xC3610000, 0x00000000, 0xC2340000, 0x42B40000, 0xC3C58000, 0x43960000, 0xC2E60000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024029C, D_80240000_B024F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190017, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3610000, 0x00000000, 0xC2340000, 0x42B40000, 0xC3C58000, 0x43960000, 0xC2E60000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024029C, D_80240000_B024F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190017, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s b/ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s index 8524074b83..030e2ad5f2 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_23/B03250.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802409D0_B03250 -.word 0x4437C000, 0x00000000, 0xC2700000, 0x43870000, 0x41200000, 0x00000000, 0xC2700000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CF4, D_802409D0_B03250, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190018, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x4437C000, 0x00000000, 0xC2700000, 0x43870000, 0x41200000, 0x00000000, 0xC2700000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CF4, D_802409D0_B03250, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190018, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s b/ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s index 281a1b16e8..d00b425fb6 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_24/B06590.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240020_B06590 -.word 0x43110000, 0x00000000, 0xC1200000, 0x43870000, 0x43110000, 0x43D20000, 0xC1A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240358, D_80240020_B06590, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190019, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x43110000, 0x00000000, 0xC1200000, 0x43870000, 0x43110000, 0x43D20000, 0xC1A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240358, D_80240020_B06590, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190019, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000066, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s b/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s index 4820bd31ec..9c2056c4fb 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_25/B07940.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240F40_B07940 -.word 0xC4174000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802414EC_B07EEC, D_80240F40_B07940, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019001A +.word 0xC4174000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802414EC_B07EEC, D_80240F40_B07940, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019001A dlabel D_80240F90_B07990 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x8024C700, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_26/B13150.data.s b/ver/us/asm/data/world/area_kkj/kkj_26/B13150.data.s index 6adc170c7c..3eda77a8a1 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_26/B13150.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_26/B13150.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240030_B13150 -.word 0x43EC0000, 0x41F00000, 0xC1D00000, 0x42B40000, 0x44070000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43C80000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43F18000, 0x41F00000, 0x41000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B8_B133D8, D_80240030_B13150, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019001B, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_80240000_B13120, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80240C30, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 +.word 0x43EC0000, 0x41F00000, 0xC1D00000, 0x42B40000, 0x44070000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43C80000, 0x41F00000, 0xC1A00000, 0x42B40000, 0x43F18000, 0x41F00000, 0x41000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B8_B133D8, D_80240030_B13150, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019001B, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01CE, 0x00000043, 0x00000001, func_80240000_B13120, 0x00000043, 0x00000002, PlaySound, 0x000000DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80240C30, 0x00000001, 0x0000000C, 0x00000008, 0x00000001, 0x00000064 dlabel D_80240100_B13220 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000024, 0x00000002, 0xFE363C83, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0x00000027, 0x00000024, 0x00000002, 0xFE363C85, 0x00000024, 0x00000044, 0x00000001, 0x80285E9C, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240C38, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C7F50.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C7F50.data.s index baf9235d26..1acb2f5f88 100644 --- a/ver/us/asm/data/world/area_nok/nok_01/9C7F50.data.s +++ b/ver/us/asm/data/world/area_nok/nok_01/9C7F50.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242B70_9C7F50 -.word 0xC3A68000, 0x00000000, 0x43AF0000, 0x42340000, 0x43EB0000, 0x00000000, 0x41200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024332C, D_80242B70_9C7F50, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190048, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3A68000, 0x00000000, 0x43AF0000, 0x42340000, 0x43EB0000, 0x00000000, 0x41200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024332C, D_80242B70_9C7F50, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190048, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000007, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DB5C0.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DB5C0.data.s index 191c7f8a22..f522d7bd67 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9DB5C0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9DB5C0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802445A0_9DB5C0 -.word 0xC3F20000, 0x00000000, 0x40A00000, 0x42B40000, 0x40000000, 0x00000000, 0xC3EF8000, 0x43340000, 0x43B68000, 0x420C0000, 0x42B40000, 0x43340000, 0x00000000, 0x00000000, 0xC2700000, 0x00000000, 0xC3B40000, 0x00000000, 0xC2480000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245A14, D_802445A0_9DB5C0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190049, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3F20000, 0x00000000, 0x40A00000, 0x42B40000, 0x40000000, 0x00000000, 0xC3EF8000, 0x43340000, 0x43B68000, 0x420C0000, 0x42B40000, 0x43340000, 0x00000000, 0x00000000, 0xC2700000, 0x00000000, 0xC3B40000, 0x00000000, 0xC2480000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245A14, D_802445A0_9DB5C0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190049, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_03/9EC610.data.s b/ver/us/asm/data/world/area_nok/nok_03/9EC610.data.s index 15a016f9b3..b442b3f4f3 100644 --- a/ver/us/asm/data/world/area_nok/nok_03/9EC610.data.s +++ b/ver/us/asm/data/world/area_nok/nok_03/9EC610.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240E20_9EC610 -.word 0xC4238000, 0x00000000, 0x40C00000, 0x42B40000, 0x4482C000, 0x00000000, 0xC1F80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024126C, D_80240E20_9EC610, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019004A, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x8000005B, 0x00000000, 0x00000377, 0x00000000, 0xFFFFFFD7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0xC4238000, 0x00000000, 0x40C00000, 0x42B40000, 0x4482C000, 0x00000000, 0xC1F80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024126C, D_80240E20_9EC610, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019004A, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x8000005B, 0x00000000, 0x00000377, 0x00000000, 0xFFFFFFD7, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_04/9EEB20.data.s b/ver/us/asm/data/world/area_nok/nok_04/9EEB20.data.s index ebbe021abd..59c02bdd42 100644 --- a/ver/us/asm/data/world/area_nok/nok_04/9EEB20.data.s +++ b/ver/us/asm/data/world/area_nok/nok_04/9EEB20.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240F30_9EEB20 -.word 0xC3A80000, 0x00000000, 0x43B20000, 0x42340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802410CC, D_80240F30_9EEB20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019004B, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3A80000, 0x00000000, 0x43B20000, 0x42340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802410CC, D_80240F30_9EEB20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019004B, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_pra/pra_32/D87240.data.s b/ver/us/asm/data/world/area_pra/pra_32/D87240.data.s index 60d31caf30..397200789f 100644 --- a/ver/us/asm/data/world/area_pra/pra_32/D87240.data.s +++ b/ver/us/asm/data/world/area_pra/pra_32/D87240.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240840_D87240 -.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802412A0_D87CA0, D_80240840_D87240, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019014D +.word 0x41500000, 0x00000000, 0x428C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802412A0_D87CA0, D_80240840_D87240, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019014D dlabel D_80240890_D87290 .word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000056, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000037, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000082, 0x00000074, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, pra_32_StarSpiritEffectFunc2, 0x00000006, 0x000000B4, 0x0000024E, 0x00000078, 0x00000074, 0x00000253, 0x000000B9, 0x00000074, 0x00000082, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000064, 0x00000074, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, pra_32_StarSpiritEffectFunc5, 0x00000006, 0x00000253, 0x00000082, 0x00000074, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000057, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242CC4, 0x00000006, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000082, 0x00000074, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, pra_32_StarSpiritEffectFunc2, 0x00000006, 0x000000B4, 0x0000024E, 0x00000078, 0x00000074, 0x00000253, 0x000000B9, 0x00000074, 0x00000082, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0x00000253, 0x000000B9, 0x00000074, 0x00000057, 0x00000000, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000253, 0x00000064, 0x00000074, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, pra_32_StarSpiritEffectFunc5, 0x00000006, 0x00000253, 0x00000082, 0x00000074, 0x00000064, 0x00000056, 0x00000000, 0x00000043, 0x00000001, pra_32_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, pra_32_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000057, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242CC4, 0x00000006, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_02/D072F0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D072F0.data.s index 9a2bda4dff..20f24b2a2e 100644 --- a/ver/us/asm/data/world/area_sam/sam_02/D072F0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_02/D072F0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241BC0_D072F0 -.word 0xC3F28000, 0x00000000, 0x42480000, 0x42B40000, 0x43F28000, 0x00000000, 0x42480000, 0x43870000, 0x00000000, 0x41F00000, 0x43870000, 0x43340000, 0x43EB0000, 0x00000000, 0x42480000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243B58, D_80241BC0_D072F0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019012A, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000003F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000039, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3F28000, 0x00000000, 0x42480000, 0x42B40000, 0x43F28000, 0x00000000, 0x42480000, 0x43870000, 0x00000000, 0x41F00000, 0x43870000, 0x43340000, 0x43EB0000, 0x00000000, 0x42480000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243B58, D_80241BC0_D072F0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019012A, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000003F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000039, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_03/D119E0.data.s b/ver/us/asm/data/world/area_sam/sam_03/D119E0.data.s index 6949b93200..e9392b03b2 100644 --- a/ver/us/asm/data/world/area_sam/sam_03/D119E0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_03/D119E0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240920_D119E0 -.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44368000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240AB0, D_80240920_D119E0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019012D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44368000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240AB0, D_80240920_D119E0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019012D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_04/D13CD0.data.s b/ver/us/asm/data/world/area_sam/sam_04/D13CD0.data.s index 3599e6ebdf..6d2b062108 100644 --- a/ver/us/asm/data/world/area_sam/sam_04/D13CD0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_04/D13CD0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240700_D13CD0 -.word 0xC3A50000, 0x00000000, 0x43AA0000, 0x42340000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC37A0000, 0x43340000, 0xC3B40000, 0x42A00000, 0xC2A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024171C, D_80240700_D13CD0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019012E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC3A50000, 0x00000000, 0x43AA0000, 0x42340000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC37A0000, 0x43340000, 0xC3B40000, 0x42A00000, 0xC2A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024171C, D_80240700_D13CD0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019012E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_05/D1A520.data.s b/ver/us/asm/data/world/area_sam/sam_05/D1A520.data.s index 461e8ebdc3..a35d74259b 100644 --- a/ver/us/asm/data/world/area_sam/sam_05/D1A520.data.s +++ b/ver/us/asm/data/world/area_sam/sam_05/D1A520.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80241D40_D1A520 -.word 0xC4368000, 0x00000000, 0xC2340000, 0x42B40000, 0x4437C000, 0x42BE0000, 0xC2480000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241ED0, D_80241D40_D1A520, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019012F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC4368000, 0x00000000, 0xC2340000, 0x42B40000, 0x4437C000, 0x42BE0000, 0xC2480000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241ED0, D_80241D40_D1A520, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x0019012F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_07/D2DD30.data.s b/ver/us/asm/data/world/area_sam/sam_07/D2DD30.data.s index 470eece8a9..1f4ffcc8cb 100644 --- a/ver/us/asm/data/world/area_sam/sam_07/D2DD30.data.s +++ b/ver/us/asm/data/world/area_sam/sam_07/D2DD30.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242000_D2DD30 -.word 0xC4BB8000, 0xC2F00000, 0xC2960000, 0x42B40000, 0x4487A000, 0x43870000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242204, D_80242000_D2DD30, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190131, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC4BB8000, 0xC2F00000, 0xC2960000, 0x42B40000, 0x4487A000, 0x43870000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242204, D_80242000_D2DD30, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190131, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_08/D31430.data.s b/ver/us/asm/data/world/area_sam/sam_08/D31430.data.s index 544d88dd97..5d854630f9 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D31430.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D31430.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802417B0_D31430 -.word 0xC4BEE000, 0xC2F00000, 0x00000000, 0x42B40000, 0xC3160000, 0x00000000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241940, D_802417B0_D31430, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190132, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC4BEE000, 0xC2F00000, 0x00000000, 0x42B40000, 0xC3160000, 0x00000000, 0xC2A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241940, D_802417B0_D31430, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190132, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_09/D366F0.data.s b/ver/us/asm/data/world/area_sam/sam_09/D366F0.data.s index c701bb9504..4980556bb1 100644 --- a/ver/us/asm/data/world/area_sam/sam_09/D366F0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_09/D366F0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240400_D366F0 -.word 0xC40D4000, 0x00000000, 0x00000000, 0x42B40000, 0x44110000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240590, D_80240400_D366F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190133, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC40D4000, 0x00000000, 0x00000000, 0x42B40000, 0x44110000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240590, D_80240400_D366F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190133, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_10/D384A0.data.s b/ver/us/asm/data/world/area_sam/sam_10/D384A0.data.s index 8e99fb64b6..e2e68f4730 100644 --- a/ver/us/asm/data/world/area_sam/sam_10/D384A0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_10/D384A0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240CA0_D384A0 -.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44764000, 0x448E8000, 0xC3480000, 0x43870000, 0x43A88000, 0xC1A00000, 0xC2D00000, 0x43870000, 0xC37F0000, 0x44520000, 0xC3570000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240F6C, D_80240CA0_D384A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190134, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44764000, 0x448E8000, 0xC3480000, 0x43870000, 0x43A88000, 0xC1A00000, 0xC2D00000, 0x43870000, 0xC37F0000, 0x44520000, 0xC3570000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240F6C, D_80240CA0_D384A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190134, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3C740.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3C740.data.s index a069e3299b..4bf31b9067 100644 --- a/ver/us/asm/data/world/area_sam/sam_11/D3C740.data.s +++ b/ver/us/asm/data/world/area_sam/sam_11/D3C740.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80242170_D3C740 -.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43E38000, 0x00000000, 0x00000000, 0x43870000, 0x43A28000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242F28, D_80242170_D3C740, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, sam_11_get_tattle, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000003F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000039, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43E38000, 0x00000000, 0x00000000, 0x43870000, 0x43A28000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242F28, D_80242170_D3C740, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, sam_11_get_tattle, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000003F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000039, 0x00000000, 0x00000008, 0x0000001B, 0x00000001, 0x00000043, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000038, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index b15dda42e4..b0418beec8 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -57,7 +57,7 @@ segments: - [0x7340, c, crash_screen] - [0x7E40, c, os/nusys/nugfxtaskmgr, -fforce-addr] - [0x8230, c, os/nusys/nusimgr] - - [0x8560, c] + - [0x8560, c, load_obfuscation_shims] - [0x8800, c] - [0x9D10, c, 9d10_len_1080] - [0xAD90, c, ad90_len_2880] @@ -941,6 +941,7 @@ segments: - [0x10C880] - type: code name: font_width + follows_vram: entity start: 0x10CC10 vram: 0x802EB3D0 subsegments: @@ -1314,6 +1315,7 @@ segments: - [0x16C7D0] - type: code start: 0x16C8E0 + name: battle_code vram: 0x8023E000 subsegments: - [0x16C8E0, c, 16c8e0] @@ -2548,30 +2550,35 @@ segments: - [0x315B80, pm_sprite_shading_profiles, sprite_shading_profiles] - type: code start: 0x3169F0 + name: create_audio_system_obfuscated vram: 0x80200000 subsegments: - - [0x3169F0, c, 3169f0] + - [0x3169F0, c, create_audio_system_obfuscated] - type: code start: 0x316A70 vram: 0x80200080 - follows_vram: 3169F0 + name: load_engine_data_obfuscated + follows_vram: create_audio_system_obfuscated subsegments: - - [0x316A70, c, 316a70] + - [0x316A70, c, load_engine_data_obfuscated] - type: code start: 0x316C00 + name: general_heap_create_obfuscated vram: 0x802AE000 subsegments: - - [0x316C00, c] + - [0x316C00, c, general_heap_create_obfuscated] - type: code start: 0x316D90 + name: battle_heap_create_obfuscated vram: 0x802AE000 subsegments: - - [0x316D90, c, 316d90] + - [0x316D90, c, battle_heap_create_obfuscated] - type: code start: 0x316F30 + name: obfuscation_shims vram: 0x802B2000 subsegments: - - [0x316F30, c, 316f30] + - [0x316F30, c, obfuscation_shims] - type: code dir: world/partner name: world_partner_goombario @@ -2662,6 +2669,7 @@ segments: - [0x325160] - type: code start: 0x3251D0 + name: world_use_item vram: 0x802C0000 subsegments: - [0x3251D0, c, world_use_item] @@ -6813,6 +6821,7 @@ segments: - type: code start: 0x415D90 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x415D90, c, 415D90] - [0x4200D0] @@ -7975,6 +7984,7 @@ segments: type: code start: 0x715850 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x715850, c, mushroom] - [0x715E50] @@ -7983,6 +7993,7 @@ segments: type: code start: 0x716C60 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x716C60, c, fire_flower] - [0x717060] @@ -7991,6 +8002,7 @@ segments: type: code start: 0x7179D0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7179D0, c, dusty_hammer] - start: 0x717C10 @@ -8005,6 +8017,7 @@ segments: type: code start: 0x718850 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x718850, c, pow_block] - [0x718BF0] @@ -8013,6 +8026,7 @@ segments: type: code start: 0x719970 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x719970, c, pebble] - start: 0x719BB0 @@ -8027,6 +8041,7 @@ segments: type: code start: 0x71A7F0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x71A7F0, c, volt_shroom] - [0x71AA70] @@ -8035,6 +8050,7 @@ segments: type: code start: 0x71B1A0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x71B1A0, c, thunder_rage] - [0x71B640] @@ -8043,6 +8059,7 @@ segments: type: code start: 0x71BE30 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x71BE30, c, snowman_doll] - [0x71C270] @@ -8051,6 +8068,7 @@ segments: type: code start: 0x71CCE0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x71CCE0, c, dried_shroom] - [0x71D010] @@ -8059,6 +8077,7 @@ segments: type: code start: 0x71D770 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x71D770, c, shooting_star] - [0x71DCC0] @@ -8067,6 +8086,7 @@ segments: type: code start: 0x71E650 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x71E650, c, sleepy_sheep] - start: 0x71EFC0 @@ -8086,6 +8106,7 @@ segments: type: code start: 0x7215A0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7215A0, c, stone_cap] - [0x721970] @@ -8094,6 +8115,7 @@ segments: type: code start: 0x722000 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x722000, c, tasty_tonic] - [0x7222D0] @@ -8102,6 +8124,7 @@ segments: type: code start: 0x722B40 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x722B40, c, thunder_bolt] - [0x722FE0] @@ -8110,6 +8133,7 @@ segments: type: code start: 0x723780 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x723780, c, ultra_shroom] - [0x723AB0] @@ -8118,6 +8142,7 @@ segments: type: code start: 0x724240 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x724240, c, unknown_item] - [0x724570] @@ -8126,6 +8151,7 @@ segments: type: code start: 0x724CE0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x724CE0, c, super_soda] - [0x725210] @@ -8134,6 +8160,7 @@ segments: type: code start: 0x725F60 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x725F60, c, hustle_drink] - [0x726240] @@ -8142,6 +8169,7 @@ segments: type: code start: 0x726DD0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x726DD0, c, stop_watch] - [0x727120] @@ -8150,6 +8178,7 @@ segments: type: code start: 0x727910 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x727910, c, dizzy_dial] - [0x727CE0] @@ -8158,6 +8187,7 @@ segments: type: code start: 0x7285E0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7285E0, c, please_come_back] - [0x728820] @@ -8166,6 +8196,7 @@ segments: type: code start: 0x728EC0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x728EC0, c, egg_missile] - start: 0x7291D0 @@ -8187,6 +8218,7 @@ segments: type: code start: 0x72A750 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x72A750, c, insecticide_herb] - start: 0x72AB70 @@ -8202,6 +8234,7 @@ segments: type: code start: 0x72B910 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x72B910, c, fright_jar] - [0x72BC60] @@ -8210,6 +8243,7 @@ segments: type: code start: 0x72C5B0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x72C5B0, c, mystery] - start: 0x72CF00 @@ -8225,6 +8259,7 @@ segments: type: code start: 0x72DB70 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x72DB70, c, repel_gel] - [0x72DE00] @@ -8233,6 +8268,7 @@ segments: type: code start: 0x72E530 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x72E530, c, life_shroom] - [0x72EA20] @@ -8241,6 +8277,7 @@ segments: type: code start: 0x72F720 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x72F720, c, coconut] - start: 0x72F960 @@ -8256,6 +8293,7 @@ segments: type: code start: 0x7305A0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7305A0, c, electro_pop] - [0x730AE0] @@ -8264,6 +8302,7 @@ segments: type: code start: 0x731300 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x731300, c, strange_cake] - start: 0x731EA0 @@ -8283,6 +8322,7 @@ segments: type: code start: 0x7330D0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7330D0, c, food] - [0x733700] @@ -8294,6 +8334,7 @@ segments: type: code start: 0x7345A0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7345A0, c, hammer] - [0x734650] @@ -8301,6 +8342,7 @@ segments: type: code start: 0x737890 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x737890, c, spin_smash] - [0x737A20] @@ -8308,6 +8350,7 @@ segments: type: code start: 0x73AED0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x73AED0, c, quake_hammer] - [0x73AF80] @@ -8315,6 +8358,7 @@ segments: type: code start: 0x73D860 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x73D860, c, jump] - [0x73D9A0] @@ -8322,6 +8366,7 @@ segments: type: code start: 0x740CC0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x740CC0, c] - [0x740DB0, data] @@ -8329,6 +8374,7 @@ segments: type: code start: 0x743DF0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x743DF0, c] - [0x743FF0, data] @@ -8336,6 +8382,7 @@ segments: type: code start: 0x746E10 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x746E10, c] - [0x746F00, data] @@ -8343,6 +8390,7 @@ segments: type: code start: 0x748DD0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x748DD0, c] - [0x748EC0, data] @@ -8350,6 +8398,7 @@ segments: type: code start: 0x74AD90 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x74AD90, c] - [0x74AF40, data] @@ -8357,6 +8406,7 @@ segments: type: code start: 0x74D570 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x74D570, c] - [0x74D850, data] @@ -8364,6 +8414,7 @@ segments: type: code start: 0x74F130 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x74F130, c] - [0x74F3D0, data] @@ -8371,6 +8422,7 @@ segments: type: code start: 0x752450 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x752450, c] - [0x752500, data] @@ -8378,6 +8430,7 @@ segments: type: code start: 0x756780 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x756780, c] - [0x756900, data] @@ -8385,6 +8438,7 @@ segments: type: code start: 0x7595B0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7595B0, c] - [0x7598D0, data] @@ -8392,6 +8446,7 @@ segments: type: code start: 0x75C980 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x75C980, c] - [0x75CCE0, data] @@ -8399,6 +8454,7 @@ segments: type: code start: 0x75E5D0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x75E5D0, c] - [0x75E8F0, data] @@ -8406,6 +8462,7 @@ segments: type: code start: 0x761920 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x761920, c] - [0x761C80, data] @@ -8413,6 +8470,7 @@ segments: type: code start: 0x763540 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x763540, c] - [0x7635F0, data] @@ -8420,6 +8478,7 @@ segments: type: code start: 0x765C20 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x765C20, c, auto_jump] - [0x765D10] @@ -8427,6 +8486,7 @@ segments: type: code start: 0x767C90 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x767C90, c] - [0x767D40, data] @@ -8434,6 +8494,7 @@ segments: type: code start: 0x76A830 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x76A830, c, auto_multibounce] - [0x76A920] @@ -8441,6 +8502,7 @@ segments: type: code start: 0x76D760 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x76D760, c] - [0x76D850, data] @@ -8448,6 +8510,7 @@ segments: type: code start: 0x76F330 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x76F330, c] - [0x76F420, data] @@ -8455,6 +8518,7 @@ segments: type: code start: 0x770F30 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x770F30, c] - [0x771020, data] @@ -8462,6 +8526,7 @@ segments: type: code start: 0x772BA0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x772BA0, c] - [0x772C50, data] @@ -8469,6 +8534,7 @@ segments: type: code start: 0x775100 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x775100, c] - [0x7751B0, data] @@ -8476,6 +8542,7 @@ segments: type: code start: 0x777690 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x777690, c] - [0x777740, data] @@ -8483,6 +8550,7 @@ segments: type: code start: 0x779C90 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x779C90, c] - [0x779E30, data] @@ -8490,6 +8558,7 @@ segments: type: code start: 0x77CB80 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x77CB80, c] - [0x77CC30, data] @@ -8497,6 +8566,7 @@ segments: type: code start: 0x77F240 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x77F240, c] - [0x77F3D0, data] @@ -8504,6 +8574,7 @@ segments: type: code start: 0x781920 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x781920, c] - [0x781AF0, data] @@ -8511,6 +8582,7 @@ segments: type: code start: 0x783BA0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x783BA0, c] - [0x783C90, data] @@ -8518,6 +8590,7 @@ segments: type: code start: 0x785B20 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x785B20, c] - [0x785C20, data] @@ -8525,6 +8598,7 @@ segments: type: code start: 0x789E60 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x789E60, c] - [0x78A490] @@ -8532,6 +8606,7 @@ segments: type: code start: 0x78B600 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x78B600, c] - [0x78C070] @@ -8539,6 +8614,7 @@ segments: type: code start: 0x78D150 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x78D150, c] - [0x78D770] @@ -8546,6 +8622,7 @@ segments: type: code start: 0x78E7D0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x78E7D0, c] - [0x78EEC0] @@ -8553,6 +8630,7 @@ segments: type: code start: 0x7900D0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7900D0, c] - [0x7909C0] @@ -8560,6 +8638,7 @@ segments: type: code start: 0x791D90 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x791D90, c] - [0x7923C0] @@ -8567,6 +8646,7 @@ segments: type: code start: 0x793D20 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x793D20, c] - [0x794240] @@ -8574,6 +8654,7 @@ segments: type: code start: 0x7952E0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7952E0, c] - [0x7959B0] @@ -8581,6 +8662,7 @@ segments: type: code start: 0x796FC0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x796FC0, c] - [0x7984B0] @@ -8588,6 +8670,7 @@ segments: type: code start: 0x7997B0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x7997B0, c] - [0x79ACA0] @@ -8595,6 +8678,7 @@ segments: type: code start: 0x79BFA0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x79BFA0, c] - [0x79C4D0] @@ -8602,6 +8686,7 @@ segments: type: code start: 0x79D8A0 vram: 0x802A1000 + follows_vram: battle_code subsegments: - [0x79D8A0, c] - [0x79DE50] @@ -8609,6 +8694,7 @@ segments: name: level_up start: 0x79EF40 vram: 0x802A1000 + follows_vram: battle_code symbol_name_format: $VRAM_$ROM subsegments: - [0x79EF40, c, level_up] @@ -14737,12 +14823,13 @@ segments: - [0xE1EC20] - type: code start: 0xE20110 + name: inspect_icon vram: 0x802B7000 subsegments: - - [0xE20110, c, E20110] + - [0xE20110, c, inspect_icon] - start: 0xE20B30 type: .data - name: E20110 + name: inspect_icon subsegments: - [0xE20B30, ci4, inspect_icon, 32, 32] - [0xE20D30, palette, inspect_icon] @@ -14751,12 +14838,13 @@ segments: - [0xE20DD0] - type: code start: 0xE20EB0 + name: speech_bubble vram: 0x802B7000 subsegments: - - [0xE20EB0, c, e20eb0] + - [0xE20EB0, c, speech_bubble] - start: 0xE215C0 type: .data - name: e20eb0 + name: speech_bubble subsegments: - [0xE215C0, ci4, speech_bubble, 32, 32] - [0xE217C0, palette, speech_bubble] @@ -14765,12 +14853,13 @@ segments: - [0xE21860] - type: code start: 0xE21870 + name: pulse_stone vram: 0x802B7000 subsegments: - - [0xE21870, c, E21870] + - [0xE21870, c, pulse_stone] - start: 0xE21EB0 type: .data - name: E21870 + name: pulse_stone subsegments: - [0xE21EB0, ci4, pulse_stone, 56, 56] - [0xE224D0, palette, pulse_stone] @@ -14780,12 +14869,13 @@ segments: - [0xE22590] - type: code start: 0xE225B0 + name: i_spy vram: 0x802B7000 subsegments: - - [0xE225B0, c, E225B0] + - [0xE225B0, c, i_spy] - start: 0xE22B30 type: .data - name: E225B0 + name: i_spy subsegments: - [0xE22B30, ci4, i_spy, 56, 56] - [0xE23150, palette, i_spy] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 484abd22cd..529a973142 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -136,7 +136,7 @@ nuSiSendMesg = 0x8002CF28; // type:func rom:0x8328 nuSiMgrStop = 0x8002CF8C; // type:func rom:0x838C nuSiMgrRestart = 0x8002CFAC; // type:func rom:0x83AC nuSiMgrThread = 0x8002CFD0; // type:func rom:0x83D0 -func_8002D160 = 0x8002D160; // type:func rom:0x8560 +load_obfuscation_shims = 0x8002D160; // type:func rom:0x8560 update_cameras = 0x8002D400; // type:func rom:0x8800 render_frame = 0x8002D73C; // type:func rom:0x8B3C create_cameras_a = 0x8002DEF4; // type:func rom:0x92F4 @@ -7673,14 +7673,14 @@ D_8029DA08 = 0x8029DA08; // type:data rom:0x1CC2E8 D_8029DA10 = 0x8029DA10; // type:data rom:0x1CC2F0 D_8029DA18 = 0x8029DA18; // type:data rom:0x1CC2F8 D_8029DA20 = 0x8029DA20; // type:data rom:0x1CC300 -func_80200000 = 0x80200000; // type:func rom:0x3169F0 -func_80200080 = 0x80200080; // type:func rom:0x316A70 -func_802AE000_316C00 = 0x802AE000; // type:func rom:0x316C00 -func_802AE000 = 0x802AE000; // type:func rom:0x316D90 -func_802B2000 = 0x802B2000; // type:func rom:0x316F30 -func_802B203C = 0x802B203C; // type:func rom:0x316F6C -func_802B2078 = 0x802B2078; // type:func rom:0x316FA8 -func_802B20B4 = 0x802B20B4; // type:func rom:0x316FE4 +create_audio_system_obfuscated = 0x80200000; // type:func rom:0x3169F0 +shim_load_engine_data_obfuscated = 0x80200080; // type:func rom:0x316A70 +general_heap_create_obfuscated = 0x802AE000; // type:func rom:0x316C00 +battle_heap_create_obfuscated = 0x802AE000; // type:func rom:0x316D90 +shim_create_audio_system_obfuscated = 0x802B2000; // type:func rom:0x316F30 +shim_load_engine_data_obfuscated = 0x802B203C; // type:func rom:0x316F6C +shim_general_heap_create_obfuscated = 0x802B2078; // type:func rom:0x316FA8 +shim_battle_heap_create_obfuscated = 0x802B20B4; // type:func rom:0x316FE4 func_802BD100_317020 = 0x802BD100; // type:func rom:0x317020 world_goombario_init = 0x802BD174; // type:func rom:0x317094 func_802BD188_3170A8 = 0x802BD188; // type:func rom:0x3170A8 @@ -25135,7 +25135,7 @@ gv_01_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xE1E740 gv_01_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xE1E864 gv_01_FadeToTitleScreen = 0x802405EC; // type:func rom:0xE1EA4C gv_01_ChangeStateToTitleScreen = 0x80240688; // type:func rom:0xE1EAE8 -E20110_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20110 +inspect_icon_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20110 func_802B70B4_E201C4 = 0x802B70B4; // type:func rom:0xE201C4 func_802B71E8_E202F8 = 0x802B71E8; // type:func rom:0xE202F8 func_802B7450_E20560 = 0x802B7450; // type:func rom:0xE20560 @@ -25148,7 +25148,7 @@ D_802B7C40_E20D50 = 0x802B7C40; // type:data rom:0xE20D50 D_802B7CB8_E20DC8 = 0x802B7CB8; // type:data rom:0xE20DC8 D_802B7D88_E20E98 = 0x802B7D88; // type:data rom:0xE20E98 D_802B7D90_E20EA0 = 0x802B7D90; // type:data rom:0xE20EA0 -e20eb0_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20EB0 +speech_bubble_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20EB0 func_802B70B4 = 0x802B70B4; // type:func rom:0xE20F64 func_802B71C8 = 0x802B71C8; // type:func rom:0xE21078 func_802B742C = 0x802B742C; // type:func rom:0xE212DC @@ -25842,9 +25842,6 @@ kmr_20_settings = 0x2800380; // type:data battle_item_insecticide_herb_temp = 0x28003C0; // type:data battle_item_insecticide_herb_temp2 = 0x28003D0; // type:data battle_item_mystery_tempStc = 0x2800410; // type:data -obfuscated_battle_heap_create = 0x7012ACA1; // type:data -obfuscated_general_heap_create = 0x7012BC11; // type:data -obfuscated__316F30_VRAM = 0x7599F6D8; // type:data osTvType = 0x80000300; // osRomBase = 0x80000308; // type:data osResetType = 0x8000030C; // type:data @@ -27209,7 +27206,6 @@ D_802EB620 = 0x802EB620; // type:data D_802EB644 = 0x802EB644; // type:data D_802ED970 = 0x802ED970; // type:data D_802EE8D0 = 0x802EE8D0; // type:data -D_802EF0D0 = 0x802EF0D0; // type:data D_802F39D0 = 0x802F39D0; // type:data D_802F4560 = 0x802F4560; // type:data heap_generalHead = 0x802FB800; // type:data diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index c362b877cd..538dd00680 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -3,13 +3,21 @@ obfuscated_battle_heap_create = battle_heap_create - 0xFEFFFFF; obfuscated_general_heap_create = general_heap_create - 0xFEFEFEF; obfuscated_load_engine_data = load_engine_data - 0x315; obfuscated_create_audio_system = create_audio_system - 0x7B; -obfuscated__316F30_VRAM = _316F30_VRAM - 0xA912928; -obfuscated__316F30_ROM_START = _316F30_ROM_START - 0x8939221; +obfuscated_obfuscation_shims_VRAM = obfuscation_shims_VRAM - 0xA912928; +obfuscated_obfuscation_shims_ROM_START = obfuscation_shims_ROM_START - 0x8939221; // hacks for various things fx_sun_undeclared = fx_sun; D_802AD673 = 0x802AD673; // remove when func_802A45D8 is decompiled with D_802AD670 instead of D_802AD673 +#ifdef SHIFT +mdl_clearRenderTasks = MAX(inspect_icon_VRAM_END, speech_bubble_VRAM_END); +mdl_clearRenderTasks = MAX(mdl_clearRenderTasks, pulse_stone_VRAM_END); +mdl_clearRenderTasks = MAX(mdl_clearRenderTasks, i_spy_VRAM_END); +#else +mdl_clearRenderTasks = 0x802B7E00; +#endif + // hard-coded heapy things D_80197000 = 0x80197000; // effect tlb stuff D_801A6000 = 0x801A6000; // effect tlb stuff @@ -19,8 +27,6 @@ D_80200000 = 0x80200000; gBackgroundImage = 0x80200000; D_80210000 = 0x80210000; heap_collisionHead = 0x80268000; -mdl_clearRenderTasks = 0x802B7E00; // is this hard-coded? -D_802EF0D0 = 0x802EF0D0; // is this hard-coded? heap_generalHead = 0x802FB800; gSpriteHeapPtr = 0x8034F800; D_8038F800 = 0x8038F800;