From 2c0cb43181ab445656e44dcfdb79b6edd9d68bda Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Aug 2021 22:10:06 +0900 Subject: [PATCH] Tidying (#375) * don't touch undefined syms/funcs auto * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "25b848a230" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "25b848a230" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * 4 npc funcs * nine sef commands * test * test2 * run undefined_syms through cpp, remove bss and dead syms files * nuContQueryRead * Remove unnecessary flags * oops * oops2 --- include/common_structs.h | 9 +- include/enums.h | 1 - include/functions.h | 1 + src/1a1f0_len_5390.c | 139 ++ src/25f00_len_940.c | 2 +- src/26840_len_20d0.c | 96 +- src/C50A0.c | 2 +- src/audio.h | 105 +- src/npc.c | 89 +- src/npc.h | 6 +- src/os/39cb0_len_100.c | 1 + src/os/3bd20_len_c0.c | 3 - src/os/nusys/nuContQueryRead.c | 6 + tools/build/configure.py | 24 +- tools/splat/.gitrepo | 4 +- tools/splat/segtypes/n64/c.py | 26 +- tools/splat/split.py | 22 +- tools/splat/util/options.py | 6 + ver/jp/dead_syms.txt | 0 ver/jp/main_bss_syms.txt | 0 .../26840_len_20d0/snd_SEFCmd_01_SetPan.s | 12 - .../26840_len_20d0/snd_SEFCmd_05.s | 15 - .../26840_len_20d0/snd_SEFCmd_06.s | 10 - .../26840_len_20d0/snd_SEFCmd_09_StartLoop.s | 11 - .../26840_len_20d0/snd_SEFCmd_0B.s | 14 - .../26840_len_20d0/snd_SEFCmd_11_Restart.s | 7 - .../26840_len_20d0/snd_SEFCmd_13.s | 10 - .../26840_len_20d0/snd_SEFCmd_14.s | 10 - .../26840_len_20d0/snd_SEFCmd_15.s | 10 - ver/us/asm/nonmatchings/npc/func_8003E0D4.s | 68 - ver/us/asm/nonmatchings/npc/npc_do_gravity.s | 97 - .../asm/nonmatchings/npc/npc_set_palswap_1.s | 10 - .../asm/nonmatchings/npc/npc_set_palswap_2.s | 10 - .../os/3bd20_len_c0/nuContQueryRead.s | 12 - ver/us/dead_syms.txt | 104 - ver/us/main_bss_syms.txt | 453 ---- ver/us/splat.yaml | 4 +- ver/us/undefined_syms.txt | 1848 +++++++++++++++++ ver/us/undefined_syms_auto.txt | 1284 ------------ 39 files changed, 2294 insertions(+), 2237 deletions(-) delete mode 100644 src/os/3bd20_len_c0.c create mode 100644 src/os/nusys/nuContQueryRead.c delete mode 100644 ver/jp/dead_syms.txt delete mode 100644 ver/jp/main_bss_syms.txt delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_01_SetPan.s delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_05.s delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_06.s delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_09_StartLoop.s delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_0B.s delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_11_Restart.s delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_13.s delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_14.s delete mode 100644 ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_15.s delete mode 100644 ver/us/asm/nonmatchings/npc/func_8003E0D4.s delete mode 100644 ver/us/asm/nonmatchings/npc/npc_do_gravity.s delete mode 100644 ver/us/asm/nonmatchings/npc/npc_set_palswap_1.s delete mode 100644 ver/us/asm/nonmatchings/npc/npc_set_palswap_2.s delete mode 100644 ver/us/asm/nonmatchings/os/3bd20_len_c0/nuContQueryRead.s delete mode 100644 ver/us/dead_syms.txt delete mode 100644 ver/us/main_bss_syms.txt diff --git a/include/common_structs.h b/include/common_structs.h index 1f998011a4..25982ca40b 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -176,7 +176,14 @@ typedef struct Npc { /* 0x0C4 */ s32* spritePaletteList; /* 0x0C8 */ Palette16 localPaletteData[16]; /* 0x2C8 */ Palette16* localPalettes[16]; - /* 0x308 */ char unk_308[16]; + /* 0x308 */ s16 unk_308; + /* 0x30A */ s16 unk_30A; + /* 0x30C */ s16 unk_30C; + /* 0x30E */ s16 unk_30E; + /* 0x310 */ s16 unk_310; + /* 0x312 */ s16 unk_312; + /* 0x314 */ s16 unk_314; + /* 0x316 */ s16 unk_316; /* 0x318 */ f32 screenSpaceOffset2D[2]; /* 0x320 */ f32 verticalStretch; /* 0x324 */ struct EffectInstance* decorations[2]; diff --git a/include/enums.h b/include/enums.h index dac3fbeca8..bd5c9e75ac 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1576,7 +1576,6 @@ enum NpcFlags { NPC_FLAG_40 = 0x00000040, NPC_FLAG_100 = 0x00000100, // TODO NPC_FLAG_GRAVITY = 0x00000200, ///< Enables gravity. Does nothing if NPC_FLAG_NO_Y_MOVEMENT is set. - NPC_FLAG_208 = 0x00000208, NPC_FLAG_LOCK_ANIMS = 0x00000400, ///< Do not allow scripts to change animation NPC_FLAG_NO_Y_MOVEMENT = 0x00000800, ///< Causes NpcMoveTo() to ignore stairs NPC_FLAG_1000 = 0x00001000, diff --git a/include/functions.h b/include/functions.h index 7cab339293..d818802610 100644 --- a/include/functions.h +++ b/include/functions.h @@ -34,6 +34,7 @@ Shadow* get_shadow_by_index(s32 index); s32 get_time_freeze_mode(void); void render_player_model(); s16 get_game_mode(void); +s32 is_picking_up_item(void); f32 integrate_gravity(void); f32 get_clamped_angle_diff(f32, f32); diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index d0269af735..df2cbae2d5 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -469,7 +469,146 @@ void update_encounters_conversation(void) { void draw_encounters_conversation(void) { } +// Mostly stack diffs, some issues with accessing fields from EncounterStatus at the very end +#ifdef NON_MATCHING +s8 check_conversation_trigger(void) { + PlayerStatus* playerStatus = &gPlayerStatus; + Camera* camera = &gCameras[gCurrentCameraID]; + f32 npcX; + f32 npcY; + f32 npcZ; + f32 angle; + f32 playerColliderRadius; + f32 playerColliderHeight; + f32 deltaX; + f32 deltaZ; + f32 playerX; + f32 playerY; + f32 playerZ; + f32 length; + f32 npcCollisionHeight; + f32 npcCollisionRadius; + Encounter* encounter; + Encounter* encounterTemp; + Npc* npc; + Npc* encounterNpc; + Enemy* enemy; + Enemy* encounterEnemy; + f32 minLength; + f32 xTemp; + f32 yTemp; + f32 zTemp; + + s32 i; + s32 j; + + playerStatus->unk_C8 = NULL; + playerStatus->flags &= ~0x2000000; + playerColliderHeight = playerStatus->colliderHeight; + playerColliderRadius = playerStatus->colliderDiameter / 2; + playerX = playerStatus->position.x; + playerY = playerStatus->position.y; + playerZ = playerStatus->position.z; + + if (gPartnerActionStatus.actionState.b[0] == 0) { + encounter = NULL; + npc = NULL; + enemy = NULL; + minLength = 65535.0f; + + for (i = 0; i < gCurrentEncounter.numEncounters; i++) { + encounterTemp = gCurrentEncounter.encounterList[i]; + + if (encounterTemp == NULL) { + continue; + } + + for (j = 0; j < encounterTemp->count; j++) { + encounterEnemy = encounterTemp->enemy[j]; + + if (encounterEnemy == NULL) { + continue; + } + + if (!(encounterEnemy->flags & 0x80000020)) { + if (encounterEnemy->flags & 1) { + if (!(encounterEnemy->flags & 0x8000000) && encounterEnemy->interactBytecode != NULL) { + encounterNpc = get_npc_unsafe(encounterEnemy->npcID); + + npcX = encounterNpc->pos.x; + npcY = encounterNpc->pos.y; + npcZ = encounterNpc->pos.z; + deltaX = npcX - playerX; + deltaZ = npcZ - playerZ; + npcCollisionHeight = encounterNpc->collisionHeight; + npcCollisionRadius = encounterNpc->collisionRadius; + length = sqrtf(SQ(deltaX) + SQ(deltaZ)); + + if (!(playerColliderRadius + npcCollisionRadius <= length) && + !(npcY + npcCollisionHeight < playerY) && + !(playerY + playerColliderHeight < npcY)) { + + if (clamp_angle(playerStatus->spriteFacingAngle) < 180.0f) { + angle = clamp_angle(camera->currentYaw - 120.0f); + if (playerStatus->trueAnimation & 0x1000000) { + angle = clamp_angle(angle + 60.0f); + } + } else { + angle = clamp_angle(camera->currentYaw + 120.0f); + if (playerStatus->trueAnimation & 0x1000000) { + angle = clamp_angle(angle - 60.0f); + } + } + + if (fabsf(get_clamped_angle_diff(angle, atan2(playerX, playerZ, npcX, npcZ))) > 90.0f) { + continue; + } + + if (!(encounterEnemy->flags & 0x10000) && encounterNpc->flags & 0x20000000) { + xTemp = npcX; + yTemp = npcY; + zTemp = npcZ; + + if (npc_test_move_taller_with_slipping(0, &xTemp, &yTemp, &zTemp, length, + atan2(npcX, npcZ, playerX, playerZ), + npcCollisionHeight, + 2.0f * npcCollisionRadius) != 0) { + continue; + } + } + + if (length < minLength) { + minLength = length; + encounter = encounterTemp; + npc = encounterNpc; + enemy = encounterEnemy; + } + } + } + } + } + } + } + + if (!(playerStatus->animFlags & 0x4000) && npc != NULL && !is_picking_up_item()) { + playerStatus->unk_C8 = npc; + playerStatus->flags |= 0x2000000; + if (playerStatus->pressedButtons & BUTTON_A) { + close_status_menu(); + enemy->encountered = 5; + gCurrentEncounter.hitType = 5; + gCurrentEncounter.currentEncounter = encounter; + gCurrentEncounter.currentEnemy = enemy; + gCurrentEncounter.eFirstStrike = FIRST_STRIKE_PLAYER; + return TRUE; + } + } + } + return FALSE; +} +#else INCLUDE_ASM(s32, "1a1f0_len_5390", check_conversation_trigger); +#endif INCLUDE_ASM(s32, "1a1f0_len_5390", create_encounters); diff --git a/src/25f00_len_940.c b/src/25f00_len_940.c index f7cea0a01d..b3214a965b 100644 --- a/src/25f00_len_940.c +++ b/src/25f00_len_940.c @@ -182,7 +182,7 @@ void func_8004B328(s16 arg0, s32 arg1) { func_80056D44(temp_s0); if (temp_s0 == 0) { - nuAuTaskStop = 0; + nuAuTaskStop = NU_AU_TASK_STOP; } break; } diff --git a/src/26840_len_20d0.c b/src/26840_len_20d0.c index 0461b89ae8..b273f3f46c 100644 --- a/src/26840_len_20d0.c +++ b/src/26840_len_20d0.c @@ -25,15 +25,15 @@ void func_8004B440(SoundManager* manager, u8 arg1, u8 arg2, UnkAl19E0* arg3, u8 for (i = 0; i < ARRAY_COUNT(manager->unk_16C); i++) { SoundPlayer* sub = &manager->unk_16C[i]; - sub->counter = 0; - sub->unk_5C = 0; + sub->sefDataReadPos = 0; + sub->sfxVolume = 0; sub->unk_8E = 0; sub->unk_90 = 0; sub->unk_92 = 0; sub->unk_94 = 0; - sub->unk_9B = 0; - sub->unk_9C = 0; - sub->unk_9D = 0; + sub->sfxPan = 0; + sub->reverb = 0; + sub->instrumentIndex = 0; sub->unk_9E = 0; sub->unk_9F = 0; sub->unk_99 = 0; @@ -185,9 +185,39 @@ INCLUDE_ASM(s32, "26840_len_20d0", snd_set_voice_volume); INCLUDE_ASM(s32, "26840_len_20d0", func_8004CDF8); +void snd_SEFCmd_00_SetVolume(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_01_SetPan(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_02_SetInstrument(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_03_SetReverb(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_04(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_05(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_06(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_07(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_08(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_09_StartLoop(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_0A_EndLoop(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_0B(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_0C(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_0D(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_0E(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_0F(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_10_Jump(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_13(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_14(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_15(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_16(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_17(SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_18(SoundManager* manager, SoundPlayer* player); + INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_00_SetVolume, SoundManager* manager, SoundPlayer* player); -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_01_SetPan, SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_01_SetPan(SoundManager* manager, SoundPlayer* player) { + s8 sfxPan = *player->sefDataReadPos; + + player->sefDataReadPos++; + player->changedPan = TRUE; + player->sfxPan = sfxPan; +} INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_02_SetInstrument, SoundManager* manager, SoundPlayer* player); @@ -195,19 +225,40 @@ INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_03_SetReverb, SoundManager* manag INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_04, SoundManager* manager, SoundPlayer* player); -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_05, SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_05(SoundManager* manager, SoundPlayer* player) { + s32 temp_v1 = *player->sefDataReadPos; -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_06, SoundManager* manager, SoundPlayer* player); + player->sefDataReadPos++; + player->unk_92 = temp_v1 * 100; +} + +void snd_SEFCmd_06(SoundManager* manager, SoundPlayer* player) { + s8 temp_v1 = *player->sefDataReadPos; + + player->sefDataReadPos++; + player->unk_94 = temp_v1; +} INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_07, SoundManager* manager, SoundPlayer* player); INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_08, SoundManager* manager, SoundPlayer* player); -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_09_StartLoop, SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_09_StartLoop(SoundManager* manager, SoundPlayer* player) { + s8 loopIterCount = *player->sefDataReadPos; + + player->sefDataReadPos++; + player->loopStartPos = player->sefDataReadPos; + player->loopIterCount = loopIterCount; +} INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0A_EndLoop, SoundManager* manager, SoundPlayer* player); -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0B, SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_0B(SoundManager* manager, SoundPlayer* player) { + if (player->unk_90 != 0) { + player->unk_8E = 3; + player->sefDataReadPos--; + } +} INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0C, SoundManager* manager, SoundPlayer* player); @@ -219,16 +270,33 @@ INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_0F, SoundManager* manager, SoundP INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_10_Jump, SoundManager* manager, SoundPlayer* player); -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_11_Restart, SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_11_Restart(SoundManager* manager, SoundPlayer* player) { + player->sefDataReadPos = player->sefReadStart; +} void snd_SEFCmd_12_NOP(SoundManager* manager, SoundPlayer* player) { } -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_13, SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_13(SoundManager* manager, SoundPlayer* player) { + s8 temp_v1 = *player->sefDataReadPos; -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_14, SoundManager* manager, SoundPlayer* player); + player->sefDataReadPos++; + player->unk_A1 = temp_v1; +} -INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_15, SoundManager* manager, SoundPlayer* player); +void snd_SEFCmd_14(SoundManager* manager, SoundPlayer* player) { + s8 temp_v1 = *player->sefDataReadPos; + + player->sefDataReadPos++; + player->unk_A2 = temp_v1; +} + +void snd_SEFCmd_15(SoundManager* manager, SoundPlayer* player) { + s8 temp_v1 = *player->sefDataReadPos; + + player->sefDataReadPos++; + player->unk_A3 = temp_v1; +} INCLUDE_ASM(void, "26840_len_20d0", snd_SEFCmd_16, SoundManager* manager, SoundPlayer* player); diff --git a/src/C50A0.c b/src/C50A0.c index ec5771fa56..c781d6b24b 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -159,7 +159,7 @@ s32 is_picking_up_item(void) { s32 ret = D_801565A8 != 0; if (D_801565A4 != 0) { - ret = 1; + ret = TRUE; } return ret; } diff --git a/src/audio.h b/src/audio.h index 627d528286..17ed263605 100644 --- a/src/audio.h +++ b/src/audio.h @@ -111,11 +111,53 @@ typedef struct SoundSFXEntry { /* 0x9 */ char unk_9[0x1]; } SoundSFXEntry; // size = 0xA +typedef struct Instrument { + /* 0x00 */ s32 wavOffset; + /* 0x04 */ s32 wavLength; + /* 0x08 */ s32 loopPredictorOffset; + /* 0x0C */ s32 loopStart; + /* 0x10 */ s32 loopEnd; + /* 0x14 */ s32 loopCount; + /* 0x18 */ s32 predictorOffset; + /* 0x1C */ s16 unk_1C; + /* 0x1E */ s16 unk_1E; + /* 0x20 */ f32 sampleRate; + /* 0x24 */ s8 skipLoopPredictor; + /* 0x25 */ s8 unk_25; + /* 0x26 */ s8 unk_26; + /* 0x27 */ s8 unk_27; + /* 0x28 */ s8 unk_28; + /* 0x29 */ s8 unk_29; + /* 0x2A */ s8 unk_2A; + /* 0x2B */ s8 unk_2B; + /* 0x2C */ s32 unkOffset; +} Instrument; // size = 0x30; + +typedef Instrument* InstrumentGroup[16]; + +typedef struct SoundLerp { + /* 0x0 */ s32 current; + /* 0x4 */ s32 step; + /* 0x8 */ s16 goal; + /* 0xA */ s16 time; +} SoundLerp; // size = 0xC + typedef struct SoundPlayer { - /* 0x00 */ s32 counter; - /* 0x04 */ char unk_04[0x58]; - /* 0x5C */ u16 unk_5C; - /* 0x5E */ char unk_5E[0x1A]; + /* 0x00 */ s8* sefDataReadPos; + /* 0x04 */ char unk_04[0x14]; + /* 0x18 */ s32 unk_18; + /* 0x1C */ Instrument* sfxInstrumentRef; + /* 0x20 */ Instrument sfxInstrument; + /* 0x50 */ s32 sefReadStart; + /* 0x54 */ s8 changedTune; + /* 0x55 */ u8 changedVolume; + /* 0x56 */ u8 changedPan; + /* 0x57 */ u8 changedReverb; + /* 0x58 */ f32 actualSampleRate; + /* 0x5C */ u16 sfxVolume; + /* 0x5E */ s16 unk_5E; + /* 0x60 */ SoundLerp tuneLerp; + /* 0x6C */ SoundLerp volumeLerp; /* 0x78 */ u8 locatorB; /* 0x79 */ u8 locatorC; /* 0x7A */ u8 locatorD; @@ -124,20 +166,35 @@ typedef struct SoundPlayer { /* 0x7D */ u8 unk_7D; /* 0x7E */ u8 unk_7E; /* 0x7F */ u8 unk_7F; - /* 0x80 */ char unk_80[0xE]; + /* 0x80 */ s32 unk_80; + /* 0x84 */ s8 unk_84; + /* 0x85 */ s8 soundC00; + /* 0x86 */ char unk_86[0x2]; + /* 0x88 */ s8* loopStartPos; + /* 0x8C */ s8 loopIterCount; + /* 0x8D */ char unk_8D; /* 0x8E */ u16 unk_8E; /* 0x90 */ u16 unk_90; /* 0x92 */ u16 unk_92; /* 0x94 */ u8 unk_94; - /* 0x95 */ char unk_05[0x4]; + /* 0x95 */ char unk_05; + /* 0x96 */ s16 currentSoundID; + /* 0x98 */ char unk_98[0x1]; /* 0x99 */ u8 unk_99; - /* 0x9A */ char unk_9A[0x1]; - /* 0x9B */ u8 unk_9B; - /* 0x9C */ u8 unk_9C; - /* 0x9D */ u8 unk_9D; + /* 0x9A */ s8 sfxParamsFlags; + /* 0x9B */ u8 sfxPan; + /* 0x9C */ u8 reverb; + /* 0x9D */ u8 instrumentIndex; // ? /* 0x9E */ u8 unk_9E; /* 0x9F */ u8 unk_9F; - /* 0xA0 */ char unk_A0[0xC]; + /* 0xA0 */ char unk_A0[0x1]; + /* 0xA1 */ s8 unk_A1; + /* 0xA2 */ s8 unk_A2; + /* 0xA3 */ s8 unk_A3; + /* 0xA4 */ s16 masterPitchShift; + /* 0xA6 */ s16 masterVolume; + /* 0xA8 */ s8 masterPan; + /* 0xA9 */ char unk_A9[0x3]; } SoundPlayer; // size = 0xAC typedef struct SoundSefHeader { @@ -171,7 +228,7 @@ typedef struct SoundManager { /* 0x0BC */ u8 unk_BC; /* 0x0BD */ u8 sfxPlayerSelector; /* 0x0BE */ u8 unk_BE; - /* 0x0BF */ char unk_BF[0x1]; + /* 0x0BF */ u8 unk_BF; /* 0x0C0 */ s8 unk_C0; /* 0x0C1 */ char unk_C1[0x1]; /* 0x0C2 */ SoundSFXEntry unk_C2[16]; @@ -196,30 +253,6 @@ typedef struct UnkAlC { /* 0xA */ s8 unk_0A; } UnkAlC; -typedef struct Instrument { - /* 0x00 */ s32 wavOffset; - /* 0x04 */ s32 wavLength; - /* 0x08 */ s32 loopPredictorOffset; - /* 0x0C */ s32 loopStart; - /* 0x10 */ s32 loopEnd; - /* 0x14 */ s32 loopCount; - /* 0x18 */ s32 predictorOffset; - /* 0x1C */ s16 unk_1C; - /* 0x1E */ s16 unk_1E; - /* 0x20 */ f32 sampleRate; - /* 0x24 */ s8 skipLoopPredictor; - /* 0x25 */ s8 unk_25; - /* 0x26 */ s8 unk_26; - /* 0x27 */ s8 unk_27; - /* 0x28 */ s8 unk_28; - /* 0x29 */ s8 unk_29; - /* 0x2A */ s8 unk_2A; - /* 0x2B */ s8 unk_2B; - /* 0x2C */ s32 unkOffset; -} Instrument; - -typedef Instrument* InstrumentGroup[16]; - typedef struct UnkAl48 { // Track? /* 0x00 */ s32 unk_00; // pointer to something /* 0x04 */ f32 unk_04; diff --git a/src/npc.c b/src/npc.c index 24caddca1b..fe6bad36a0 100644 --- a/src/npc.c +++ b/src/npc.c @@ -16,6 +16,7 @@ extern s32 D_80077C20; extern s16 D_80077C30; extern s32 D_80077C34; +extern s16 D_80077C38; extern s16 D_80077C3A; void STUB_npc_callback(void) { @@ -260,7 +261,7 @@ void npc_do_world_collision(Npc* npc) { f32 temp_y; f32 temp_z; - if (npc->flags & 0x40) { + if (npc->flags & NPC_FLAG_40) { npc->flags |= NPC_FLAG_8000000; } else if ((npc->pos.x != npc->colliderPos.x) || (npc->pos.y != npc->colliderPos.y) || (npc->pos.z != npc->colliderPos.z) || npc->flags & NPC_FLAG_8000000) { @@ -356,15 +357,53 @@ INCLUDE_ASM(void, "npc", npc_do_other_npc_collision, Npc* npc); INCLUDE_ASM(s32, "npc", npc_do_player_collision, Npc* npc); -INCLUDE_ASM(void, "npc", npc_do_gravity, Npc* npc); +void npc_do_gravity(Npc* npc) { + if (npc->flags & NPC_FLAG_GRAVITY) { + if (npc->flags & NPC_FLAG_NO_Y_MOVEMENT) { + npc->flags &= ~NPC_FLAG_1000; + } else { + f32 xTemp; + f32 yTemp; + f32 zTemp; + f32 length, oldLength; + s32 hit; + + npc->jumpScale = 1.0f; + xTemp = npc->pos.x; + zTemp = npc->pos.z; + + npc->jumpVelocity -= npc->jumpScale; + npc->pos.y += npc->jumpVelocity; + oldLength = length = fabsf(npc->jumpVelocity) + 16.0f; + + yTemp = npc->pos.y + 13.0f; + + if (!(npc->flags & NPC_FLAG_PARTICLE)) { + hit = npc_raycast_down_sides(npc->unk_80, &xTemp, &yTemp, &zTemp, &length); + } else { + hit = npc_raycast_down_ahead(npc->unk_80, &xTemp, &yTemp, &zTemp, &length, npc->yaw, + npc->collisionRadius); + } + + if (hit && length <= oldLength) { + npc->jumpVelocity = 0.0f; + npc->flags |= NPC_FLAG_1000; + npc->pos.y = yTemp; + npc->unk_84 = D_8010C97A; + } else { + npc->flags &= ~NPC_FLAG_1000; + } + } + } +} s32 func_800397E8(Npc* npc, f32 arg1) { - if (!(npc->flags & NPC_FLAG_208)) { + if (!(npc->flags & (NPC_FLAG_GRAVITY | NPC_FLAG_ENABLE_HIT_SCRIPT))) { f32 x; f32 y; f32 z; - f32 subroutine_arg; - f32 temp_v1; + f32 length; + f32 oldLength; s32 phi_v0; if (npc->flags & NPC_FLAG_NO_Y_MOVEMENT) { @@ -372,20 +411,18 @@ s32 func_800397E8(Npc* npc, f32 arg1) { return 0; } - temp_v1 = fabsf(arg1) + 16; - subroutine_arg = temp_v1; + length = oldLength = fabsf(arg1) + 16; x = npc->pos.x; y = npc->pos.y + 13; z = npc->pos.z; if (!(npc->flags & NPC_FLAG_PARTICLE)) { - phi_v0 = npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &subroutine_arg); + phi_v0 = npc_raycast_down_sides(npc->unk_80, &x, &y, &z, &length); } else { - phi_v0 = npc_raycast_down_ahead(npc->unk_80, &x, &y, &z, &subroutine_arg, npc->yaw, - npc->collisionRadius); + phi_v0 = npc_raycast_down_ahead(npc->unk_80, &x, &y, &z, &length, npc->yaw, npc->collisionRadius); } - if (phi_v0 != 0 && subroutine_arg <= temp_v1) { + if (phi_v0 != 0 && length <= oldLength) { npc->pos.y = y; npc->unk_84 = D_8010C97A; npc->flags |= NPC_FLAG_1000; @@ -797,9 +834,19 @@ void func_8003B420(Npc* npc) { npc->unk_B6 = 1; } -INCLUDE_ASM(s32, "npc", npc_set_palswap_1); +void npc_set_palswap_1(Npc* npc, s32 palIndexA, s32 palIndexB, s32 timeHoldA, s32 timeAB) { + npc->unk_308 = palIndexA; + npc->unk_30A = palIndexB; + npc->unk_30C = timeHoldA; + npc->unk_30E = timeAB; +} -INCLUDE_ASM(s32, "npc", npc_set_palswap_2); +void npc_set_palswap_2(Npc* npc, s32 timeHoldB, s32 timeBA, s32 palIndexC, s32 palIndexD) { + npc->unk_310 = timeHoldB; + npc->unk_312 = timeBA; + npc->unk_314 = palIndexC; + npc->unk_316 = palIndexD; +} void npc_draw_with_palswap(Npc* npc, s32 arg1, s32 arg2) { switch (npc->unk_B4) { @@ -1293,7 +1340,7 @@ void func_8003D624(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s #ifdef NON_MATCHING // Rodata padding issue. Most likely belongs to a separate TU than the function above with the switch. void func_8003D660(Npc* npc, s32 arg1) { - Temp8010EBB0* temp = &gPartnerActionStatus; + PartnerActionStatus* temp = &gPartnerActionStatus; if ((npc->flags & (NPC_FLAG_400000 | NPC_FLAG_2)) == NPC_FLAG_400000) { if (npc->moveSpeed != 0.0f) { @@ -1387,8 +1434,20 @@ void func_8003DFA0(Npc* npc) { } } +void func_8003E0D4(Npc* npc) { + if (D_80077C38++ >= 4) { + f32 theta; + f32 sinTheta; + f32 cosTheta; -INCLUDE_ASM(s32, "npc", func_8003E0D4); + D_80077C38 = 0; + theta = (clamp_angle(-npc->yaw) * TAU) / 360.0f; + sinTheta = sin_rad(theta); + cosTheta = cos_rad(theta); + playFX_2C(1, npc->pos.x + (npc->collisionRadius * sinTheta * 0.2f), + 40.0f, npc->pos.z + (npc->collisionRadius * cosTheta * 0.2f)); + } +} void func_8003E1D0(Npc* npc) { if (D_80077C3A++ >= 4) { diff --git a/src/npc.h b/src/npc.h index 48aecf7d75..b83fe55725 100644 --- a/src/npc.h +++ b/src/npc.h @@ -86,9 +86,9 @@ void npc_set_palswap_mode_B(Npc* npc, s32 arg1); void func_8003B420(Npc* npc); -s32 npc_set_palswap_1(); +void npc_set_palswap_1(Npc* npc, s32 palIndexA, s32 palIndexB, s32 timeHoldA, s32 timeAB); -s32 npc_set_palswap_2(); +void npc_set_palswap_2(Npc* npc, s32 timeHoldB, s32 timeBA, s32 palIndexC, s32 palIndexD); void npc_draw_with_palswap(Npc* npc, s32 arg1, s32 arg2); @@ -186,7 +186,7 @@ s32 func_8003DC38(); void func_8003DFA0(Npc* npc); -s32 func_8003E0D4(); +void func_8003E0D4(); void func_8003E1D0(Npc* npc); diff --git a/src/os/39cb0_len_100.c b/src/os/39cb0_len_100.c index 8efe33863e..4e95ca0d39 100644 --- a/src/os/39cb0_len_100.c +++ b/src/os/39cb0_len_100.c @@ -6,6 +6,7 @@ // TODO: create src/os/nusys/nuSched.h? extern u64 nuScStack[NU_SC_STACK_SIZE / sizeof(u64)]; +// probably should be at 0x8009A630, unless D_8009A630 (what's technically used in boot_idle) isn't nuIdleFunc static void (*nuIdleFunc)(void); void nuBoot(void) { diff --git a/src/os/3bd20_len_c0.c b/src/os/3bd20_len_c0.c deleted file mode 100644 index 7bb4a84d63..0000000000 --- a/src/os/3bd20_len_c0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/3bd20_len_c0", nuContQueryRead); diff --git a/src/os/nusys/nuContQueryRead.c b/src/os/nusys/nuContQueryRead.c new file mode 100644 index 0000000000..0efbe23190 --- /dev/null +++ b/src/os/nusys/nuContQueryRead.c @@ -0,0 +1,6 @@ +#include "common.h" +#include "nu/nusys.h" + +void nuContQueryRead(void) { + nuSiSendMesg(NU_CONT_QUERY_MSG, NULL); +} diff --git a/tools/build/configure.py b/tools/build/configure.py index f389688ef9..bc2250b6dd 100755 --- a/tools/build/configure.py +++ b/tools/build/configure.py @@ -12,9 +12,8 @@ DO_SHA1_CHECK = True CPPFLAGS = "-w -Iver/$version/build/include -Iinclude -Isrc -Iassets/$version -D _LANGUAGE_C -D _FINALROM -D VERSION=$version " \ "-ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32" -CFLAGS = "-O2 -quiet -fno-common -G0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 " \ - "-Wuninitialized -Wmissing-braces" -ASFLAGS = "-EB -G 0" +CFLAGS = "-G0 -O2 -quiet -fno-common -Wuninitialized -Wmissing-braces" +ASFLAGS = "-G0" # Paths: ROOT = Path(__file__).parent.parent.parent @@ -66,7 +65,7 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra ninja.rule("ld", description="link($version) $out", - command=f"{cross}ld -T ver/$version/undefined_syms.txt -T ver/$version/undefined_syms_auto.txt -T ver/$version/undefined_funcs_auto.txt -T ver/$version/dead_syms.txt -T ver/$version/main_bss_syms.txt -Map $mapfile --no-check-sections -T $in -o $out", + command=f"{cross}ld -T ver/$version/build/undefined_syms.txt -T ver/$version/undefined_syms_auto.txt -T ver/$version/undefined_funcs_auto.txt -Map $mapfile --no-check-sections -T $in -o $out", ) ninja.rule("z64", @@ -79,6 +78,11 @@ def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str, cppflags: str, extra command="sha1sum -c $in && touch $out" if DO_SHA1_CHECK else "touch $out", ) + ninja.rule("cpp", + description="cpp $in", + command=f"{cpp} $in {cppflags} -P -o $out" + ) + ninja.rule("cc", description="cc($version) $in $cflags", command=f"bash -o pipefail -c '{cpp} {CPPFLAGS} {cppflags} -MD -MF $out.d $in -o - | {iconv} | {cc1} {cflags} $cflags -o - | {nu64as} {ASFLAGS} - -o $out'", @@ -216,6 +220,9 @@ class Configure: def build_path(self) -> Path: return Path(f"ver/{self.version}/build") + def undefined_syms_path(self) -> Path: + return self.build_path() / "undefined_syms.txt" + def elf_path(self) -> Path: # TODO: read basename and build_path from splat.yaml return Path(f"ver/{self.version}/build/papermario.elf") @@ -568,12 +575,19 @@ class Configure: else: raise Exception(f"don't know how to build {seg.__class__.__name__} '{seg.name}'") + # Run undefined_syms through cpp + ninja.build( + str(self.undefined_syms_path()), + "cpp", + str(self.version_path / "undefined_syms.txt") + ) + # Build elf, z64, ok ninja.build( str(self.elf_path()), "ld", str(self.linker_script_path()), - implicit=[str(obj) for obj in built_objects], + implicit=[str(obj) for obj in built_objects] + [str(self.undefined_syms_path())], variables={ "version": self.version, "mapfile": str(self.map_path()) }, ) ninja.build( diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index 1ebe270ffc..c3db5e5181 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = 265b837554469fddfdd8155c872298a7b3244183 - parent = 99ddf7cb0eb0611d29fd8038e45b17e4512a1722 + commit = 25b848a230458b50c0d9124cf9af872cebb44ef2 + parent = 08f58ae5d9d266caf805fdee477008f88e84f1f9 method = merge cmdver = 0.4.3 diff --git a/tools/splat/segtypes/n64/c.py b/tools/splat/segtypes/n64/c.py index c60f3463dd..79599780b9 100644 --- a/tools/splat/segtypes/n64/c.py +++ b/tools/splat/segtypes/n64/c.py @@ -67,14 +67,19 @@ class N64SegC(N64SegCodeSubsegment): def split(self, rom_bytes: bytes): if not self.rom_start == self.rom_end: + asm_out_dir = options.get_asm_path() / "nonmatchings" / self.dir asm_out_dir.mkdir(parents=True, exist_ok=True) for func in self.funcs_text: func_name = self.parent.get_symbol(func, type="func", local_only=True).name - if func_name in self.global_asm_funcs: - self.create_c_asm_file(self.funcs_text, func, asm_out_dir, func_name) + if options.get_compiler() == "GCC": + if func_name not in self.defined_funcs: + self.create_c_asm_file(self.funcs_text, func, asm_out_dir, func_name) + else: + if func_name in self.global_asm_funcs: + self.create_c_asm_file(self.funcs_text, func, asm_out_dir, func_name) c_path = self.out_path() if c_path: @@ -149,12 +154,19 @@ class N64SegC(N64SegCodeSubsegment): for func in funcs_text: func_name = self.parent.get_symbol(func, type="func", local_only=True).name - if options.get_compiler() == "GCC": - c_lines.append("INCLUDE_ASM(s32, \"{}\", {});".format(self.name, func_name)) + + # Terrible hack to "auto-decompile" empty functions + # TODO move disassembly into funcs_text or somewhere we can access it from here + if len(funcs_text[func][0]) == 3 and funcs_text[func][0][1][-3:] == "$ra" and funcs_text[func][0][2][-3:] == "nop": + c_lines.append("void " + func_name + "(void) {") + c_lines.append("}") else: - asm_outpath = Path(os.path.join(asm_out_dir, self.name, func_name + ".s")) - rel_asm_outpath = os.path.relpath(asm_outpath, options.get_base_path()) - c_lines.append(f"#pragma GLOBAL_ASM(\"{rel_asm_outpath}\")") + if options.get_compiler() == "GCC": + c_lines.append("INCLUDE_ASM(s32, \"{}\", {});".format(self.name, func_name)) + else: + asm_outpath = Path(os.path.join(asm_out_dir, self.dir, self.name, func_name + ".s")) + rel_asm_outpath = os.path.relpath(asm_outpath, options.get_base_path()) + c_lines.append(f"#pragma GLOBAL_ASM(\"{rel_asm_outpath}\")") c_lines.append("") Path(c_path).parent.mkdir(parents=True, exist_ok=True) diff --git a/tools/splat/split.py b/tools/splat/split.py index 06aa791bff..9f291038da 100755 --- a/tools/splat/split.py +++ b/tools/splat/split.py @@ -233,18 +233,20 @@ def main(config_path, base_dir, target_path, modes, verbose, use_cache=True): linker_writer.save_symbol_header() # Write undefined_funcs_auto.txt - to_write = [s for s in symbols.all_symbols if s.referenced and not s.defined and not s.dead and s.type == "func"] - if len(to_write) > 0: - with open(options.get_undefined_funcs_auto_path(), "w", newline="\n") as f: - for symbol in to_write: - f.write(f"{symbol.name} = 0x{symbol.vram_start:X};\n") + if options.get_create_undefined_funcs_auto(): + to_write = [s for s in symbols.all_symbols if s.referenced and not s.defined and not s.dead and s.type == "func"] + if len(to_write) > 0: + with open(options.get_undefined_funcs_auto_path(), "w", newline="\n") as f: + for symbol in to_write: + f.write(f"{symbol.name} = 0x{symbol.vram_start:X};\n") # write undefined_syms_auto.txt - to_write = [s for s in symbols.all_symbols if s.referenced and not s.defined and not s.dead and not s.type == "func"] - if len(to_write) > 0: - with open(options.get_undefined_syms_auto_path(), "w", newline="\n") as f: - for symbol in to_write: - f.write(f"{symbol.name} = 0x{symbol.vram_start:X};\n") + if options.get_create_undefined_syms_auto(): + to_write = [s for s in symbols.all_symbols if s.referenced and not s.defined and not s.dead and not s.type == "func"] + if len(to_write) > 0: + with open(options.get_undefined_syms_auto_path(), "w", newline="\n") as f: + for symbol in to_write: + f.write(f"{symbol.name} = 0x{symbol.vram_start:X};\n") # print warnings during split for segment in all_segments: diff --git a/tools/splat/util/options.py b/tools/splat/util/options.py index 808689a72c..29b3d6e785 100644 --- a/tools/splat/util/options.py +++ b/tools/splat/util/options.py @@ -62,9 +62,15 @@ def get_asm_path() -> Path: def get_cache_path(): return get_base_path() / opts.get("cache_path", ".splat_cache") +def get_create_undefined_funcs_auto() -> bool: + return opts.get("create_undefined_funcs_auto", True) + def get_undefined_funcs_auto_path(): return get_base_path() / opts.get("undefined_funcs_auto_path", "undefined_funcs_auto.txt") +def get_create_undefined_syms_auto() -> bool: + return opts.get("create_undefined_syms_auto", True) + def get_undefined_syms_auto_path(): return get_base_path() / opts.get("undefined_syms_auto_path", "undefined_syms_auto.txt") diff --git a/ver/jp/dead_syms.txt b/ver/jp/dead_syms.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ver/jp/main_bss_syms.txt b/ver/jp/main_bss_syms.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_01_SetPan.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_01_SetPan.s deleted file mode 100644 index 3368bb3ed7..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_01_SetPan.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_01_SetPan -/* 282A4 8004CEA4 8CA20000 */ lw $v0, ($a1) -/* 282A8 8004CEA8 90430000 */ lbu $v1, ($v0) -/* 282AC 8004CEAC 24420001 */ addiu $v0, $v0, 1 -/* 282B0 8004CEB0 ACA20000 */ sw $v0, ($a1) -/* 282B4 8004CEB4 24020001 */ addiu $v0, $zero, 1 -/* 282B8 8004CEB8 A0A20056 */ sb $v0, 0x56($a1) -/* 282BC 8004CEBC 03E00008 */ jr $ra -/* 282C0 8004CEC0 A0A3009B */ sb $v1, 0x9b($a1) diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_05.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_05.s deleted file mode 100644 index 32db85a3e2..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_05.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_05 -/* 2840C 8004D00C 8CA20000 */ lw $v0, ($a1) -/* 28410 8004D010 80430000 */ lb $v1, ($v0) -/* 28414 8004D014 24420001 */ addiu $v0, $v0, 1 -/* 28418 8004D018 ACA20000 */ sw $v0, ($a1) -/* 2841C 8004D01C 00031040 */ sll $v0, $v1, 1 -/* 28420 8004D020 00431021 */ addu $v0, $v0, $v1 -/* 28424 8004D024 000210C0 */ sll $v0, $v0, 3 -/* 28428 8004D028 00431021 */ addu $v0, $v0, $v1 -/* 2842C 8004D02C 00021080 */ sll $v0, $v0, 2 -/* 28430 8004D030 03E00008 */ jr $ra -/* 28434 8004D034 A4A20092 */ sh $v0, 0x92($a1) diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_06.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_06.s deleted file mode 100644 index 9718bc5902..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_06.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_06 -/* 28438 8004D038 8CA20000 */ lw $v0, ($a1) -/* 2843C 8004D03C 90430000 */ lbu $v1, ($v0) -/* 28440 8004D040 24420001 */ addiu $v0, $v0, 1 -/* 28444 8004D044 ACA20000 */ sw $v0, ($a1) -/* 28448 8004D048 03E00008 */ jr $ra -/* 2844C 8004D04C A0A30094 */ sb $v1, 0x94($a1) diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_09_StartLoop.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_09_StartLoop.s deleted file mode 100644 index 6c6c03c6a1..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_09_StartLoop.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_09_StartLoop -/* 28514 8004D114 8CA20000 */ lw $v0, ($a1) -/* 28518 8004D118 90430000 */ lbu $v1, ($v0) -/* 2851C 8004D11C 24420001 */ addiu $v0, $v0, 1 -/* 28520 8004D120 ACA20000 */ sw $v0, ($a1) -/* 28524 8004D124 ACA20088 */ sw $v0, 0x88($a1) -/* 28528 8004D128 03E00008 */ jr $ra -/* 2852C 8004D12C A0A3008C */ sb $v1, 0x8c($a1) diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_0B.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_0B.s deleted file mode 100644 index b5a41cde1d..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_0B.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_0B -/* 2855C 8004D15C 94A20090 */ lhu $v0, 0x90($a1) -/* 28560 8004D160 10400005 */ beqz $v0, .L8004D178 -/* 28564 8004D164 24030003 */ addiu $v1, $zero, 3 -/* 28568 8004D168 8CA20000 */ lw $v0, ($a1) -/* 2856C 8004D16C A4A3008E */ sh $v1, 0x8e($a1) -/* 28570 8004D170 2442FFFF */ addiu $v0, $v0, -1 -/* 28574 8004D174 ACA20000 */ sw $v0, ($a1) -.L8004D178: -/* 28578 8004D178 03E00008 */ jr $ra -/* 2857C 8004D17C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_11_Restart.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_11_Restart.s deleted file mode 100644 index dd3b2776bd..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_11_Restart.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_11_Restart -/* 28710 8004D310 8CA20050 */ lw $v0, 0x50($a1) -/* 28714 8004D314 03E00008 */ jr $ra -/* 28718 8004D318 ACA20000 */ sw $v0, ($a1) diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_13.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_13.s deleted file mode 100644 index fa0414fcb5..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_13.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_13 -/* 28724 8004D324 8CA20000 */ lw $v0, ($a1) -/* 28728 8004D328 90430000 */ lbu $v1, ($v0) -/* 2872C 8004D32C 24420001 */ addiu $v0, $v0, 1 -/* 28730 8004D330 ACA20000 */ sw $v0, ($a1) -/* 28734 8004D334 03E00008 */ jr $ra -/* 28738 8004D338 A0A300A1 */ sb $v1, 0xa1($a1) diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_14.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_14.s deleted file mode 100644 index 02fe4c284b..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_14.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_14 -/* 2873C 8004D33C 8CA20000 */ lw $v0, ($a1) -/* 28740 8004D340 90430000 */ lbu $v1, ($v0) -/* 28744 8004D344 24420001 */ addiu $v0, $v0, 1 -/* 28748 8004D348 ACA20000 */ sw $v0, ($a1) -/* 2874C 8004D34C 03E00008 */ jr $ra -/* 28750 8004D350 A0A300A2 */ sb $v1, 0xa2($a1) diff --git a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_15.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_15.s deleted file mode 100644 index ed9226f140..0000000000 --- a/ver/us/asm/nonmatchings/26840_len_20d0/snd_SEFCmd_15.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel snd_SEFCmd_15 -/* 28754 8004D354 8CA20000 */ lw $v0, ($a1) -/* 28758 8004D358 90430000 */ lbu $v1, ($v0) -/* 2875C 8004D35C 24420001 */ addiu $v0, $v0, 1 -/* 28760 8004D360 ACA20000 */ sw $v0, ($a1) -/* 28764 8004D364 03E00008 */ jr $ra -/* 28768 8004D368 A0A300A3 */ sb $v1, 0xa3($a1) diff --git a/ver/us/asm/nonmatchings/npc/func_8003E0D4.s b/ver/us/asm/nonmatchings/npc/func_8003E0D4.s deleted file mode 100644 index 0f9c7c38c3..0000000000 --- a/ver/us/asm/nonmatchings/npc/func_8003E0D4.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8003E0D4 -/* 194D4 8003E0D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 194D8 8003E0D8 AFB00010 */ sw $s0, 0x10($sp) -/* 194DC 8003E0DC 0080802D */ daddu $s0, $a0, $zero -/* 194E0 8003E0E0 3C048007 */ lui $a0, %hi(D_80077C38) -/* 194E4 8003E0E4 24847C38 */ addiu $a0, $a0, %lo(D_80077C38) -/* 194E8 8003E0E8 AFBF0014 */ sw $ra, 0x14($sp) -/* 194EC 8003E0EC F7B40018 */ sdc1 $f20, 0x18($sp) -/* 194F0 8003E0F0 94820000 */ lhu $v0, ($a0) -/* 194F4 8003E0F4 24430001 */ addiu $v1, $v0, 1 -/* 194F8 8003E0F8 00021400 */ sll $v0, $v0, 0x10 -/* 194FC 8003E0FC 00021403 */ sra $v0, $v0, 0x10 -/* 19500 8003E100 28420004 */ slti $v0, $v0, 4 -/* 19504 8003E104 1440002D */ bnez $v0, .L8003E1BC -/* 19508 8003E108 A4830000 */ sh $v1, ($a0) -/* 1950C 8003E10C C60C000C */ lwc1 $f12, 0xc($s0) -/* 19510 8003E110 A4800000 */ sh $zero, ($a0) -/* 19514 8003E114 0C00A6C9 */ jal clamp_angle -/* 19518 8003E118 46006307 */ neg.s $f12, $f12 -/* 1951C 8003E11C 3C0140C9 */ lui $at, 0x40c9 -/* 19520 8003E120 34210FD0 */ ori $at, $at, 0xfd0 -/* 19524 8003E124 44811000 */ mtc1 $at, $f2 -/* 19528 8003E128 00000000 */ nop -/* 1952C 8003E12C 46020502 */ mul.s $f20, $f0, $f2 -/* 19530 8003E130 00000000 */ nop -/* 19534 8003E134 3C0143B4 */ lui $at, 0x43b4 -/* 19538 8003E138 44810000 */ mtc1 $at, $f0 -/* 1953C 8003E13C 00000000 */ nop -/* 19540 8003E140 4600A503 */ div.s $f20, $f20, $f0 -/* 19544 8003E144 0C00A85B */ jal sin_rad -/* 19548 8003E148 4600A306 */ mov.s $f12, $f20 -/* 1954C 8003E14C 4600A306 */ mov.s $f12, $f20 -/* 19550 8003E150 0C00A874 */ jal cos_rad -/* 19554 8003E154 46000506 */ mov.s $f20, $f0 -/* 19558 8003E158 860200A6 */ lh $v0, 0xa6($s0) -/* 1955C 8003E15C 44821000 */ mtc1 $v0, $f2 -/* 19560 8003E160 00000000 */ nop -/* 19564 8003E164 468010A0 */ cvt.s.w $f2, $f2 -/* 19568 8003E168 46141502 */ mul.s $f20, $f2, $f20 -/* 1956C 8003E16C 00000000 */ nop -/* 19570 8003E170 46001082 */ mul.s $f2, $f2, $f0 -/* 19574 8003E174 00000000 */ nop -/* 19578 8003E178 3C013E4C */ lui $at, 0x3e4c -/* 1957C 8003E17C 3421CCCD */ ori $at, $at, 0xcccd -/* 19580 8003E180 44810000 */ mtc1 $at, $f0 -/* 19584 8003E184 00000000 */ nop -/* 19588 8003E188 4600A502 */ mul.s $f20, $f20, $f0 -/* 1958C 8003E18C 00000000 */ nop -/* 19590 8003E190 46001082 */ mul.s $f2, $f2, $f0 -/* 19594 8003E194 00000000 */ nop -/* 19598 8003E198 C6000038 */ lwc1 $f0, 0x38($s0) -/* 1959C 8003E19C 46140000 */ add.s $f0, $f0, $f20 -/* 195A0 8003E1A0 44050000 */ mfc1 $a1, $f0 -/* 195A4 8003E1A4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 195A8 8003E1A8 46020000 */ add.s $f0, $f0, $f2 -/* 195AC 8003E1AC 3C064220 */ lui $a2, 0x4220 -/* 195B0 8003E1B0 44070000 */ mfc1 $a3, $f0 -/* 195B4 8003E1B4 0C01C244 */ jal playFX_2C -/* 195B8 8003E1B8 24040001 */ addiu $a0, $zero, 1 -.L8003E1BC: -/* 195BC 8003E1BC 8FBF0014 */ lw $ra, 0x14($sp) -/* 195C0 8003E1C0 8FB00010 */ lw $s0, 0x10($sp) -/* 195C4 8003E1C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 195C8 8003E1C8 03E00008 */ jr $ra -/* 195CC 8003E1CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/npc/npc_do_gravity.s b/ver/us/asm/nonmatchings/npc/npc_do_gravity.s deleted file mode 100644 index b024008685..0000000000 --- a/ver/us/asm/nonmatchings/npc/npc_do_gravity.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel npc_do_gravity -/* 14A88 80039688 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 14A8C 8003968C AFB00030 */ sw $s0, 0x30($sp) -/* 14A90 80039690 0080802D */ daddu $s0, $a0, $zero -/* 14A94 80039694 AFBF0034 */ sw $ra, 0x34($sp) -/* 14A98 80039698 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 14A9C 8003969C 8E030000 */ lw $v1, ($s0) -/* 14AA0 800396A0 30620200 */ andi $v0, $v1, 0x200 -/* 14AA4 800396A4 1040004B */ beqz $v0, .L800397D4 -/* 14AA8 800396A8 30620800 */ andi $v0, $v1, 0x800 -/* 14AAC 800396AC 14400047 */ bnez $v0, .L800397CC -/* 14AB0 800396B0 2402EFFF */ addiu $v0, $zero, -0x1001 -/* 14AB4 800396B4 3C013F80 */ lui $at, 0x3f80 -/* 14AB8 800396B8 44810000 */ mtc1 $at, $f0 -/* 14ABC 800396BC C602001C */ lwc1 $f2, 0x1c($s0) -/* 14AC0 800396C0 C6040038 */ lwc1 $f4, 0x38($s0) -/* 14AC4 800396C4 46001081 */ sub.s $f2, $f2, $f0 -/* 14AC8 800396C8 E6000014 */ swc1 $f0, 0x14($s0) -/* 14ACC 800396CC C600003C */ lwc1 $f0, 0x3c($s0) -/* 14AD0 800396D0 E7A40020 */ swc1 $f4, 0x20($sp) -/* 14AD4 800396D4 3C014150 */ lui $at, 0x4150 -/* 14AD8 800396D8 44812000 */ mtc1 $at, $f4 -/* 14ADC 800396DC 46020000 */ add.s $f0, $f0, $f2 -/* 14AE0 800396E0 3C030400 */ lui $v1, 0x400 -/* 14AE4 800396E4 E602001C */ swc1 $f2, 0x1c($s0) -/* 14AE8 800396E8 E600003C */ swc1 $f0, 0x3c($s0) -/* 14AEC 800396EC 3C014180 */ lui $at, 0x4180 -/* 14AF0 800396F0 44810000 */ mtc1 $at, $f0 -/* 14AF4 800396F4 46001085 */ abs.s $f2, $f2 -/* 14AF8 800396F8 46001080 */ add.s $f2, $f2, $f0 -/* 14AFC 800396FC C600003C */ lwc1 $f0, 0x3c($s0) -/* 14B00 80039700 C6060040 */ lwc1 $f6, 0x40($s0) -/* 14B04 80039704 46040000 */ add.s $f0, $f0, $f4 -/* 14B08 80039708 E7A60028 */ swc1 $f6, 0x28($sp) -/* 14B0C 8003970C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 14B10 80039710 E7A00024 */ swc1 $f0, 0x24($sp) -/* 14B14 80039714 8E020000 */ lw $v0, ($s0) -/* 14B18 80039718 00431024 */ and $v0, $v0, $v1 -/* 14B1C 8003971C 1440000A */ bnez $v0, .L80039748 -/* 14B20 80039720 46001506 */ mov.s $f20, $f2 -/* 14B24 80039724 27A50020 */ addiu $a1, $sp, 0x20 -/* 14B28 80039728 27A60024 */ addiu $a2, $sp, 0x24 -/* 14B2C 8003972C 27A2002C */ addiu $v0, $sp, 0x2c -/* 14B30 80039730 AFA20010 */ sw $v0, 0x10($sp) -/* 14B34 80039734 8E040080 */ lw $a0, 0x80($s0) -/* 14B38 80039738 0C0372DF */ jal npc_raycast_down_sides -/* 14B3C 8003973C 27A70028 */ addiu $a3, $sp, 0x28 -/* 14B40 80039740 0800E5E0 */ j .L80039780 -/* 14B44 80039744 00000000 */ nop -.L80039748: -/* 14B48 80039748 27A2002C */ addiu $v0, $sp, 0x2c -/* 14B4C 8003974C AFA20010 */ sw $v0, 0x10($sp) -/* 14B50 80039750 C600000C */ lwc1 $f0, 0xc($s0) -/* 14B54 80039754 27A50020 */ addiu $a1, $sp, 0x20 -/* 14B58 80039758 E7A00014 */ swc1 $f0, 0x14($sp) -/* 14B5C 8003975C 860200A6 */ lh $v0, 0xa6($s0) -/* 14B60 80039760 27A60024 */ addiu $a2, $sp, 0x24 -/* 14B64 80039764 44820000 */ mtc1 $v0, $f0 -/* 14B68 80039768 00000000 */ nop -/* 14B6C 8003976C 46800020 */ cvt.s.w $f0, $f0 -/* 14B70 80039770 E7A00018 */ swc1 $f0, 0x18($sp) -/* 14B74 80039774 8E040080 */ lw $a0, 0x80($s0) -/* 14B78 80039778 0C0371DE */ jal npc_raycast_down_ahead -/* 14B7C 8003977C 27A70028 */ addiu $a3, $sp, 0x28 -.L80039780: -/* 14B80 80039780 10400010 */ beqz $v0, .L800397C4 -/* 14B84 80039784 00000000 */ nop -/* 14B88 80039788 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 14B8C 8003978C 4614003E */ c.le.s $f0, $f20 -/* 14B90 80039790 00000000 */ nop -/* 14B94 80039794 4500000B */ bc1f .L800397C4 -/* 14B98 80039798 00000000 */ nop -/* 14B9C 8003979C 8E020000 */ lw $v0, ($s0) -/* 14BA0 800397A0 AE00001C */ sw $zero, 0x1c($s0) -/* 14BA4 800397A4 C7A00024 */ lwc1 $f0, 0x24($sp) -/* 14BA8 800397A8 3C038011 */ lui $v1, %hi(D_8010C97A) -/* 14BAC 800397AC 9463C97A */ lhu $v1, %lo(D_8010C97A)($v1) -/* 14BB0 800397B0 34421000 */ ori $v0, $v0, 0x1000 -/* 14BB4 800397B4 AE020000 */ sw $v0, ($s0) -/* 14BB8 800397B8 E600003C */ swc1 $f0, 0x3c($s0) -/* 14BBC 800397BC 0800E5F5 */ j .L800397D4 -/* 14BC0 800397C0 A6030084 */ sh $v1, 0x84($s0) -.L800397C4: -/* 14BC4 800397C4 8E020000 */ lw $v0, ($s0) -/* 14BC8 800397C8 2403EFFF */ addiu $v1, $zero, -0x1001 -.L800397CC: -/* 14BCC 800397CC 00431024 */ and $v0, $v0, $v1 -/* 14BD0 800397D0 AE020000 */ sw $v0, ($s0) -.L800397D4: -/* 14BD4 800397D4 8FBF0034 */ lw $ra, 0x34($sp) -/* 14BD8 800397D8 8FB00030 */ lw $s0, 0x30($sp) -/* 14BDC 800397DC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 14BE0 800397E0 03E00008 */ jr $ra -/* 14BE4 800397E4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/npc/npc_set_palswap_1.s b/ver/us/asm/nonmatchings/npc/npc_set_palswap_1.s deleted file mode 100644 index 66632b0a09..0000000000 --- a/ver/us/asm/nonmatchings/npc/npc_set_palswap_1.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel npc_set_palswap_1 -/* 1684C 8003B44C 8FA20010 */ lw $v0, 0x10($sp) -/* 16850 8003B450 A4850308 */ sh $a1, 0x308($a0) -/* 16854 8003B454 A486030A */ sh $a2, 0x30a($a0) -/* 16858 8003B458 A487030C */ sh $a3, 0x30c($a0) -/* 1685C 8003B45C 03E00008 */ jr $ra -/* 16860 8003B460 A482030E */ sh $v0, 0x30e($a0) diff --git a/ver/us/asm/nonmatchings/npc/npc_set_palswap_2.s b/ver/us/asm/nonmatchings/npc/npc_set_palswap_2.s deleted file mode 100644 index 750bbba6c0..0000000000 --- a/ver/us/asm/nonmatchings/npc/npc_set_palswap_2.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel npc_set_palswap_2 -/* 16864 8003B464 8FA20010 */ lw $v0, 0x10($sp) -/* 16868 8003B468 A4850310 */ sh $a1, 0x310($a0) -/* 1686C 8003B46C A4860312 */ sh $a2, 0x312($a0) -/* 16870 8003B470 A4870314 */ sh $a3, 0x314($a0) -/* 16874 8003B474 03E00008 */ jr $ra -/* 16878 8003B478 A4820316 */ sh $v0, 0x316($a0) diff --git a/ver/us/asm/nonmatchings/os/3bd20_len_c0/nuContQueryRead.s b/ver/us/asm/nonmatchings/os/3bd20_len_c0/nuContQueryRead.s deleted file mode 100644 index 2d53babea3..0000000000 --- a/ver/us/asm/nonmatchings/os/3bd20_len_c0/nuContQueryRead.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContQueryRead -/* 3BD20 80060920 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3BD24 80060924 24040103 */ addiu $a0, $zero, 0x103 -/* 3BD28 80060928 AFBF0010 */ sw $ra, 0x10($sp) -/* 3BD2C 8006092C 0C00B3CA */ jal nuSiSendMesg -/* 3BD30 80060930 0000282D */ daddu $a1, $zero, $zero -/* 3BD34 80060934 8FBF0010 */ lw $ra, 0x10($sp) -/* 3BD38 80060938 03E00008 */ jr $ra -/* 3BD3C 8006093C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/dead_syms.txt b/ver/us/dead_syms.txt deleted file mode 100644 index a76fb17cb1..0000000000 --- a/ver/us/dead_syms.txt +++ /dev/null @@ -1,104 +0,0 @@ -dead_atan2 = 0x8002AF70; -D_80100060 = 0x80100060; -D_801000A0 = 0x801000A0; -dead_get_variable = 0x802D4E8C; -dead_set_variable = 0x802D5468; -dead_get_float_variable = 0x802D57FC; -dead_cos_rad = 0x8002B4C0; -dead_set_float_variable = 0x802D5A10; -dead_playFX_11 = 0x80075170; -dead_gPlayerStatusPtr = 0x800FFC90; -dead_set_main_pan_u = 0x80126064; -dead_set_main_pan_v = 0x8012607C; -dead_set_aux_pan_u = 0x80126094; -dead_set_aux_pan_v = 0x801260AC; -dead_get_npc_unsafe = 0x8003E4BC; -func_80075110 = 0x80075110; -func_80042AF4 = 0x80042AF4; -func_8002B1C4 = 0x8002B1C4; -func_8002AF18 = 0x8002AF18; -dead_clamp_angle = 0x8002AE14; -func_8004D800 = 0x8004D800; -func_8002B28C = 0x8002B28C; -func_8004D9C0 = 0x8004D9C0; -func_8004DAD8 = 0x8004DAD8; -func_8004DF64 = 0x8004DF64; -func_8004E024 = 0x8004E024; -func_8004E25C = 0x8004E25C; -func_8004E2EC = 0x8004E2EC; -func_8004E39C = 0x8004E39C; -func_8004E544 = 0x8004E544; -func_8004E808 = 0x8004E808; -func_8004EB8C = 0x8004EB8C; -func_8004D1A4 = 0x8004D1A4; -func_8003E424 = 0x8003E424; -func_80067040 = 0x80067040; -func_800E5304 = 0x800E5304; -func_800E423C = 0x800E423C; -func_8004D0C4 = 0x8004D0C4; -func_8004D8E0 = 0x8004D8E0; -dead_rand_int = 0x8002ACEC; -func_8003E534 = 0x8003E534; -func_8002BFD4 = 0x8002BFD4; -func_8002C01C = 0x8002C01C; -func_8002B5DC = 0x8002B5DC; -func_8002B640 = 0x8002B640; -func_800F1EF8 = 0x800F1EF8; -func_8015704C = 0x8015704C; -func_80077C30 = 0x80077C30; -func_8002B6A4 = 0x8002B6A4; -func_80077930 = 0x80077930; -func_8011AAB4 = 0x8011AAB4; -func_8002B21C = 0x8002B21C; -func_802E2A80 = 0x802E2A80; -func_802E2B74 = 0x802E2B74; -func_80128510 = 0x80128510; -func_8012DFE8 = 0x8012DFE8; -func_8002AA2C = 0x8002AA2C; -func_80059AC8 = 0x80059AC8; -func_80118BB0 = 0x80118BB0; -func_80077BD0 = 0x80077BD0; -func_80041080 = 0x80041080; -func_800F1D9C = 0x800F1D9C; -func_800F1730 = 0x800F1730; -func_8003C43C = 0x8003C43C; -func_800F1718 = 0x800F1718; -func_800F16F4 = 0x800F16F4; -func_80125270 = 0x80125270; -func_80124F44 = 0x80124F44; -func_8006CAC0 = 0x8006CAC0; -func_800775D0 = 0x800775D0; -func_802F3B00 = 0x802F3B00; -func_800FCD0C = 0x800FCD0C; -func_800F9260 = 0x800F9260; -func_800F93E8 = 0x800F93E8; -func_800F2D5C = 0x800F2D5C; -func_80130C74 = 0x80130C74; -func_800769D0 = 0x800769D0; -func_80075E30 = 0x80075E30; -func_8002B524 = 0x8002B524; -func_8002BF18 = 0x8002BF18; -func_80076970 = 0x80076970; -func_80144200 = 0x80144200; -func_80144178 = 0x80144178; -func_800E53AC = 0x800E53AC; -func_8013CF98 = 0x8013CF98; -func_80066FE0 = 0x80066FE0; -func_8002A910 = 0x8002A910; -func_8005F128 = 0x8005F128; -func_800F7278 = 0x800F7278; -func_800F2E98 = 0x800F2E98; -func_8003ED50 = 0x8003ED50; -func_8003E5E8 = 0x8003E5E8; -func_8002FCBC = 0x8002FCBC; -func_801574DC = 0x801574DC; -func_80157118 = 0x80157118; -func_8005F238 = 0x8005F238; -func_80074070 = 0x80074070; -func_8002BF68 = 0x8002BF68; -func_80130C64 = 0x80130C64; -func_8002B45C = 0x8002B45C; -func_801266F8 = 0x801266F8; -func_80126734 = 0x80126734; -func_80144194 = 0x80144194; -dead_gItemTable = 0x8008D2C0; diff --git a/ver/us/main_bss_syms.txt b/ver/us/main_bss_syms.txt deleted file mode 100644 index 18c340faa0..0000000000 --- a/ver/us/main_bss_syms.txt +++ /dev/null @@ -1,453 +0,0 @@ -nuScPreNMIFlag = 0x8009A5B0; -D_8009A5B8 = 0x8009A5B8; -D_8009A5C0 = 0x8009A5C0; -D_8009A5C8 = 0x8009A5C8; -D_8009A5CC = 0x8009A5CC; -D_8009A5D0 = 0x8009A5D0; -D_8009A5D4 = 0x8009A5D4; -timeFreezeMode = 0x8009A5D8; -nuGfxZBuffer = 0x8009A5DC; -nuContDataLockKey = 0x8009A5E0; -D_8009A5E4 = 0x8009A5E4; -D_8009A5E8 = 0x8009A5E8; -D_8009A5EC = 0x8009A5EC; -nuGfxCfbCounter = 0x8009A5F0; -D_8009A5F4 = 0x8009A5F4; -nuGfxDisplay = 0x8009A5F8; -D_8009A5FC = 0x8009A5FC; -gGameState = 0x8009A600; -gNpcCount = 0x8009A604; -D_8009A606 = 0x8009A606; -D_8009A608 = 0x8009A608; -D_8009A60C = 0x8009A60C; -nuGfxUcode = 0x8009A610; -nuContNum = 0x8009A614; -nuGfxTaskSpool = 0x8009A618; -D_8009A61C = 0x8009A61C; -D_8009A620 = 0x8009A620; -D_8009A628 = 0x8009A628; -D_8009A62C = 0x8009A62C; -D_8009A630 = 0x8009A630; -gCurrentCamID = 0x8009A634; -nuPiCartHandle = 0x8009A638; -D_8009A63C = 0x8009A63C; -D_8009A640 = 0x8009A640; -nuGfxCfb_ptr = 0x8009A64C; -gOverrideFlags = 0x8009A650; -D_8009A654 = 0x8009A654; -nuGfxCfb = 0x8009A658; -D_8009A660 = 0x8009A660; -D_8009A664 = 0x8009A664; -D_8009A668 = 0x8009A668; -gMasterGfxPos = 0x8009A66C; -D_8009A670 = 0x8009A670; -gDisplayContext = 0x8009A674; -D_8009A678 = 0x8009A678; -D_8009A680 = 0x8009A680; -D_8009A690 = 0x8009A690; -D_8009A6A0 = 0x8009A6A0; -D_8009A6A2 = 0x8009A6A2; -D_8009A6A4 = 0x8009A6A4; -D_8009A6A6 = 0x8009A6A6; -D_8009A6B0 = 0x8009A6B0; -logicalSaveInfo = 0x8009BA30; -physicalSaveInfo = 0x8009BA50; -nextAvailableSavePage = 0x8009BA80; -gCurtainScale = 0x8009BA90; -gCurtainScaleGoal = 0x8009BA94; -gCurtainFade = 0x8009BA98; -gCurtainFadeGoal = 0x8009BA9C; -gCurtainDrawCallback = 0x8009BAA0; -D_8009BAA8 = 0x8009BAA8; -D_8009BB30 = 0x8009BB30; -D_8009C4E0 = 0x8009C4E0; -D_8009C4FC = 0x8009C4FC; -nuGfxTask_ptr = 0x8009C510; -taskDoneMsg = 0x8009C514; -swapBufMsg = 0x8009C516; -GfxTaskMgrThread = 0x8009C518; -D_8009E6D0 = 0x8009E6D0; -nuSiMesgBuf = 0x8009E6F0; -siMgrThread = 0x8009E710; -D_800A08C0 = 0x800A08C0; -D_800A08DC = 0x800A08DC; -D_800A08E0 = 0x800A08E0; -D_800A08E4 = 0x800A08E4; -D_800A08E8 = 0x800A08E8; -D_800A08EC = 0x800A08EC; -gameMode = 0x800A08F0; -D_800A0900 = 0x800A0900; -D_800A0904 = 0x800A0904; -D_800A0908 = 0x800A0908; -D_800A0910 = 0x800A0910; -D_800A0914 = 0x800A0914; -D_800A0918 = 0x800A0918; -D_800A091C = 0x800A091C; -D_800A0920 = 0x800A0920; -D_800A0921 = 0x800A0921; -D_800A0922 = 0x800A0922; -D_800A0924 = 0x800A0924; -D_800A0930 = 0x800A0930; -D_800A0931 = 0x800A0931; -D_800A0932 = 0x800A0932; -gMapTransitionAlpha = 0x800A0940; -D_800A0942 = 0x800A0942; -D_800A0944 = 0x800A0944; -D_800A0946 = 0x800A0946; -D_800A0948 = 0x800A0948; -D_800A0950 = 0x800A0950; -D_800A0954 = 0x800A0954; -D_800A0956 = 0x800A0956; -D_800A0958 = 0x800A0958; -D_800A095A = 0x800A095A; -D_800A095B = 0x800A095B; -D_800A095C = 0x800A095C; -D_800A095D = 0x800A095D; -D_800A095E = 0x800A095E; -D_800A095F = 0x800A095F; -D_800A0960 = 0x800A0960; -D_800A0963 = 0x800A0963; -D_800A0964 = 0x800A0964; -D_800A0970 = 0x800A0970; -D_800A0974 = 0x800A0974; -D_800A0978 = 0x800A0978; -D_800A097C = 0x800A097C; -D_800A0980 = 0x800A0980; -D_800A0988 = 0x800A0988; -gWorldNpcList = 0x800A0990; -gBattleNpcList = 0x800A0A90; -gCurrentNpcListPtr = 0x800A0B90; -D_800A0B94 = 0x800A0B94; -D_800A0BA0 = 0x800A0BA0; -D_800A0BA4 = 0x800A0BA4; -D_800A0BA8 = 0x800A0BA8; -D_800A0BAC = 0x800A0BAC; -D_800A0BB0 = 0x800A0BB0; -D_800A0BB4 = 0x800A0BB4; -D_800A0BB8 = 0x800A0BB8; -D_800A0BC0 = 0x800A0BC0; -D_800A0F40 = 0x800A0F40; -D_800A0F44 = 0x800A0F44; -D_800A0F50 = 0x800A0F50; -D_800A0F58 = 0x800A0F58; -D_800A1530 = 0x800A1530; -D_800A158C = 0x800A158C; -D_800A15A4 = 0x800A15A4; -D_800A15A8 = 0x800A15A8; -D_800A15C4 = 0x800A15C4; -D_800A15CC = 0x800A15CC; -D_800A3510 = 0x800A3510; -D_800A3520 = 0x800A3520; -D_800A3628 = 0x800A3628; -nuAuFrameSampleSize = 0x800A3634; -D_800A3638 = 0x800A3638; -D_800A3640 = 0x800A3640; -D_800A3658 = 0x800A3658; -D_800A3720 = 0x800A3720; -nuAuDmaState = 0x800A3BD0; -D_800A3BD4 = 0x800A3BD4; -nuAuDmaBuf = 0x800A3BE0; -D_800A3BF0 = 0x800A3BF0; -D_800A3FD0 = 0x800A3FD0; -D_800A3FE0 = 0x800A3FE0; -D_800A3FE4 = 0x800A3FE4; -D_800A3FE8 = 0x800A3FE8; -D_800A3FEC = 0x800A3FEC; -D_800A3FEE = 0x800A3FEE; -D_800A3FF0 = 0x800A3FF0; -gEffectGraphicsData = 0x800A4000; -D_800A41C0 = 0x800A41C0; -gMap = 0x800A41E0; -gMapConfig = 0x800A41E8; -D_800A4230 = 0x800A4230; -D_800A4234 = 0x800A4234; -D_800A4238 = 0x800A4238; -D_800A423C = 0x800A423C; -D_800A4240 = 0x800A4240; -D_800A4244 = 0x800A4244; -D_800A4248 = 0x800A4248; -D_800A424C = 0x800A424C; -D_800A4250 = 0x800A4250; -D_800A4254 = 0x800A4254; -D_800A4258 = 0x800A4258; -D_800A425C = 0x800A425C; -D_800A4260 = 0x800A4260; -D_800A4264 = 0x800A4264; -D_800A4268 = 0x800A4268; -D_800A4270 = 0x800A4270; -D_800A4420 = 0x800A4420; -nuScStack = 0x800A65D0; -nuScAudioStack = 0x800A85D0; -nuScGraphicsStack = 0x800AA5D0; -D_800AC5D0 = 0x800AC5D0; -D_800AC5E8 = 0x800AC5E8; -nuGfxMesgBuf = 0x800AC6B0; -nuContWaitMesgBuf = 0x800AE6D0; -nuContDataMutexBuf = 0x800AE6D4; -piMgrThread = 0x800AE6E0; -__osPiMesgQueue = 0x800AF890; -piMgrMesgBuff = 0x800AF8A8; -D_800AF8B0 = 0x800AF8B0; -D_800AF8C0 = 0x800AF8C0; -D_800AF8C4 = 0x800AF8C4; -D_800AF8D0 = 0x800AF8D0; -D_800AF8D8 = 0x800AF8D8; -D_800AF8DC = 0x800AF8DC; -D_800AF8E0 = 0x800AF8E0; -D_800AF8E8 = 0x800AF8E8; -D_800AF8EC = 0x800AF8EC; -D_800AF8F0 = 0x800AF8F0; -D_800AF8F8 = 0x800AF8F8; -D_800AF8FC = 0x800AF8FC; -D_800AF900 = 0x800AF900; -D_800AF910 = 0x800AF910; -D_800AF918 = 0x800AF918; -D_800B0AD0 = 0x800B0AD0; -D_800B0AE8 = 0x800B0AE8; -D_800B0B00 = 0x800B0B00; -D_800B0B02 = 0x800B0B02; -D_800B0B04 = 0x800B0B04; -D_800B0B18 = 0x800B0B18; -D_800B0B1A = 0x800B0B1A; -D_800B0B1C = 0x800B0B1C; -D_800B0B30 = 0x800B0B30; -D_800B0B6C = 0x800B0B6C; -D_800B0C30 = 0x800B0C30; -D_800B0C40 = 0x800B0C40; -D_800B0C42 = 0x800B0C42; -D_800B0C44 = 0x800B0C44; -D_800B0C48 = 0x800B0C48; -D_800B0C4C = 0x800B0C4C; -D_800B0C50 = 0x800B0C50; -D_800B0C58 = 0x800B0C58; -D_800B0C70 = 0x800B0C70; -D_800B0C74 = 0x800B0C74; -D_800B0C75 = 0x800B0C75; -D_800B0C76 = 0x800B0C76; -D_800B0C77 = 0x800B0C77; -D_800B0C78 = 0x800B0C78; -D_800B0C79 = 0x800B0C79; -D_800B0C7C = 0x800B0C7C; -D_800B0C80 = 0x800B0C80; -D_800B0CE4 = 0x800B0CE4; -D_800B0CE8 = 0x800B0CE8; -wMapTexName = 0x800B0CF0; -D_800B0D08 = 0x800B0D08; -nuContWaitMesgQ = 0x800B0EB8; -D_800B0ED0 = 0x800B0ED0; -D_800B0F08 = 0x800B0F08; -D_800B0F0C = 0x800B0F0C; -gCurrentEncounter = 0x800B0F10; -LeoDiskHandle = 0x800B1B08; -D_800B1B0C = 0x800B1B0C; -D_800B1B0D = 0x800B1B0D; -D_800B1B0E = 0x800B1B0E; -D_800B1B0F = 0x800B1B0F; -D_800B1B10 = 0x800B1B10; -nuContStatus = 0x800B1B7C; -D_800B1B90 = 0x800B1B90; -nuContRmbCtl = 0x800B1D40; -nuContData = 0x800B1D68; -gCameras = 0x800B1D80; -gCollisionData = 0x800B42E0; -nuGfxMesgQ = 0x800B42F0; -D_800B4308 = 0x800B4308; -D_800B430C = 0x800B430C; -D_800B430D = 0x800B430D; -D_800B430E = 0x800B430E; -D_800B430F = 0x800B430F; -D_800B4310 = 0x800B4310; -D_800B4311 = 0x800B4311; -D_800B4314 = 0x800B4314; -D_800B4318 = 0x800B4318; -gOsPiMessageQueue = 0x800B4380; -gEffectInstances = 0x800B4398; -D_800B4514 = 0x800B4514; -CartRomHandle = 0x800B4518; -D_800B451C = 0x800B451C; -D_800B451D = 0x800B451D; -D_800B451E = 0x800B451E; -D_800B451F = 0x800B451F; -D_800B4520 = 0x800B4520; -D_800B6590 = 0x800B6590; -D_800B7EF0 = 0x800B7EF0; -nuYieldBuf = 0x800B8590; -dead_gCameras = 0x800B8D80; -D_800B8DEC = 0x800B8DEC; -D_800B91A0 = 0x800B91A0; -D_800B91D0 = 0x800B91D0; -D_800D91D0 = 0x800D91D0; -D_800D91D4 = 0x800D91D4; -D_800D91DC = 0x800D91DC; -wMapHitName = 0x800D91E0; -nuSiMgrMesgQ = 0x800D91F8; -wMapShapeName = 0x800D9230; -D_800D9248 = 0x800D9248; -nuGfxTask = 0x800D9278; -D_800D95E8 = 0x800D95E8; -D_800D9620 = 0x800D9620; -D_800D9668 = 0x800D9668; -D_800D9680 = 0x800D9680; -D_800D9780 = 0x800D9780; -D_800D9F80 = 0x800D9F80; -D_800DA000 = 0x800DA000; -D_800DA03C = 0x800DA03C; -D_800DA040 = 0x800DA040; -nusched = 0x800DA440; -D_800DA444 = 0x800DA444; -D_800DA47C = 0x800DA47C; -D_800DA4B4 = 0x800DA4B4; -D_800DA55C = 0x800DA55C; -D_800DAAA8 = 0x800DAAA8; -D_800DAAAC = 0x800DAAAC; -D_800DAAB8 = 0x800DAAB8; -D_800DAABC = 0x800DAABC; -D_800DAABD = 0x800DAABD; -D_800DAAC0 = 0x800DAAC0; -nuContPfs = 0x800DAAD8; -nuSiMesgQ = 0x800DAC78; -D_800DAC90 = 0x800DAC90; -D_800DACA8 = 0x800DACA8; -gCurrentSaveFile = 0x800DACC0; -D_800DBC70 = 0x800DBC70; -D_800DBD70 = 0x800DBD70; -D_800DBF70 = 0x800DBF70; -D_800DBF90 = 0x800DBF90; -nuContDataMutexQ = 0x800DC040; -D_800DC060 = 0x800DC060; -D_800DC064 = 0x800DC064; -gBattleState = 0x800DC068; -gBattleStatus = 0x800DC070; -D_800DC4D0 = 0x800DC4D0; -D_800DC4D4 = 0x800DC4D4; -D_800DC4D8 = 0x800DC4D8; -gBattleState2 = 0x800DC4DC; -D_800DC4E0 = 0x800DC4E0; -D_800DC4E4 = 0x800DC4E4; -D_800DC4E8 = 0x800DC4E8; -gCurrentBattleSection = 0x800DC4EA; -D_800DC4EB = 0x800DC4EB; -D_800DC4EC = 0x800DC4EC; -D_800DC4F0 = 0x800DC4F0; -D_800DC4F4 = 0x800DC4F4; -D_800DC4F8 = 0x800DC4F8; -D_800DC4FC = 0x800DC4FC; -D_8010C920 = 0x8010C920; -D_8010C924 = 0x8010C924; -D_8010C928 = 0x8010C928; -D_8010C92C = 0x8010C92C; -wPartnerNpc = 0x8010C930; -D_8010C934 = 0x8010C934; -D_8010C938 = 0x8010C938; -D_8010C93C = 0x8010C93C; -D_8010C940 = 0x8010C940; -gSpinHistoryBufferPos = 0x8010C944; -D_8010C94C = 0x8010C94C; -D_8010C950 = 0x8010C950; -D_8010C954 = 0x8010C954; -D_8010C958 = 0x8010C958; -D_8010C95C = 0x8010C95C; -D_8010C960 = 0x8010C960; -D_8010C964 = 0x8010C964; -D_8010C968 = 0x8010C968; -D_8010C96B = 0x8010C96B; -D_8010C96C = 0x8010C96C; -D_8010C970 = 0x8010C970; -D_8010C974 = 0x8010C974; -D_8010C978 = 0x8010C978; -D_8010C97A = 0x8010C97A; -D_8010C97C = 0x8010C97C; -D_8010C980 = 0x8010C980; -D_8010C984 = 0x8010C984; -D_8010C98C = 0x8010C98C; -D_8010C990 = 0x8010C990; -D_8010C9A0 = 0x8010C9A0; -D_8010C9B0 = 0x8010C9B0; -D_8010C9C0 = 0x8010C9C0; -D_8010C9C8 = 0x8010C9C8; -D_8010CCF8 = 0x8010CCF8; -D_8010CCFA = 0x8010CCFA; -D_8010CCFC = 0x8010CCFC; -D_8010CCFE = 0x8010CCFE; -D_8010CD00 = 0x8010CD00; -D_8010CD10 = 0x8010CD10; -D_8010CD12 = 0x8010CD12; -D_8010CD20 = 0x8010CD20; -D_8010CD30 = 0x8010CD30; -D_8010CD34 = 0x8010CD34; -D_8010CD38 = 0x8010CD38; -D_8010CFB8 = 0x8010CFB8; -D_8010CFBC = 0x8010CFBC; -D_8010CFC0 = 0x8010CFC0; -D_8010CFC4 = 0x8010CFC4; -D_8010CFC8 = 0x8010CFC8; -D_8010CFCA = 0x8010CFCA; -D_8010CFCC = 0x8010CFCC; -D_8010CFCE = 0x8010CFCE; -D_8010CFD0 = 0x8010CFD0; -D_8010CFD4 = 0x8010CFD4; -D_8010CFD8 = 0x8010CFD8; -D_8010CFDC = 0x8010CFDC; -D_8010CFE0 = 0x8010CFE0; -D_8010CFE4 = 0x8010CFE4; -D_8010CFE8 = 0x8010CFE8; -wPartner = 0x8010CFEC; -D_8010CFF0 = 0x8010CFF0; -D_8010CFF4 = 0x8010CFF4; -D_8010D000 = 0x8010D000; -D_8010D640 = 0x8010D640; -D_8010D644 = 0x8010D644; -D_8010D648 = 0x8010D648; -D_8010D64C = 0x8010D64C; -D_8010D650 = 0x8010D650; -D_8010D654 = 0x8010D654; -D_8010D655 = 0x8010D655; -D_8010D656 = 0x8010D656; -D_8010D658 = 0x8010D658; -D_8010D65A = 0x8010D65A; -D_8010D65C = 0x8010D65C; -D_8010D660 = 0x8010D660; -D_8010D664 = 0x8010D664; -D_8010D668 = 0x8010D668; -D_8010D66C = 0x8010D66C; -D_8010D670 = 0x8010D670; -D_8010D674 = 0x8010D674; -D_8010D678 = 0x8010D678; -D_8010D67C = 0x8010D67C; -D_8010D67E = 0x8010D67E; -D_8010D680 = 0x8010D680; -D_8010D682 = 0x8010D682; -D_8010D684 = 0x8010D684; -D_8010D686 = 0x8010D686; -D_8010D688 = 0x8010D688; -D_8010D68A = 0x8010D68A; -D_8010D68C = 0x8010D68C; -D_8010D68E = 0x8010D68E; -D_8010D68F = 0x8010D68F; -D_8010D690 = 0x8010D690; -D_8010D691 = 0x8010D691; -D_8010D692 = 0x8010D692; -D_8010D693 = 0x8010D693; -D_8010D694 = 0x8010D694; -D_8010D698 = 0x8010D698; -D_8010D699 = 0x8010D699; -D_8010D69A = 0x8010D69A; -D_8010D69C = 0x8010D69C; -D_8010D6A0 = 0x8010D6A0; -D_8010D6A4 = 0x8010D6A4; -D_8010D6B0 = 0x8010D6B0; -gPartnerActionStatus = 0x8010EBB0; -gSpinHistoryPosY = 0x8010EF10; -gSpinHistoryPosX = 0x8010EF28; -gSpinHistoryPosZ = 0x8010EF40; -gUIStatus = 0x8010EF58; -D_8010EF92 = 0x8010EF92; -D_8010EF9C = 0x8010EF9C; -D_8010EF9D = 0x8010EF9D; -D_8010EF9E = 0x8010EF9E; -gPlayerStatus = 0x8010EFC8; -gPlayerActionState = 0x8010F07C; -gPlayerAnimation = 0x8010F080; -D_8010F250 = 0x8010F250; -gPlayerData = 0x8010F290; -gSpinHistoryPosAngle = 0x8010F6B8; diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index ca3d0d20f3..1a0bcf6f2e 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -20,6 +20,8 @@ options: asset_path: assets/us build_path: ver/us/build cache_path: ver/us/.splat_cache + create_undefined_funcs_auto: False + create_undefined_syms_auto: False undefined_funcs_auto_path: ver/us/undefined_funcs_auto.txt undefined_syms_auto_path: ver/us/undefined_syms_auto.txt asset_stack: @@ -120,7 +122,7 @@ segments: - [0x3B890, c, os/nusys/nuSiCallBackRemove] - [0x3B910, c, os/nusys/nuContMgr] - [0x3BCC0, c, os/nusys/nuContDataLock] - - [0x3BD20, c, os/3bd20_len_c0] + - [0x3BD20, c, os/nusys/nuContQueryRead] - [0x3BD40, hasm, os/osSetIntMask] - [0x3BDE0, c, os/osCreatePiManager] - [0x3C160, c, os/osEPiWriteIo] # MOVE_ADDU diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 8e51e6d723..4c57c85336 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -57,3 +57,1851 @@ D_800FBBE0 = 0x800FBBE0; D_7012BC11 = 0x7012BC11; D_7012ACA1 = 0x7012ACA1; D_80200000 = 0x80200000; + +D_80000000 = 0x80000000; +osTvType = 0x80000300; +D_80000308 = 0x80000308; +D_8000030C = 0x8000030C; +D_80000318 = 0x80000318; +D_8000031C = 0x8000031C; +D_80026AC7 = 0x80026AC7; +D_8004AA85 = 0x8004AA85; +D_80117160 = 0x80117160; +D_80117163 = 0x80117163; +D_80117578 = 0x80117578; +D_80117604 = 0x80117604; +D_8011762C = 0x8011762C; +D_80117840 = 0x80117840; +D_80117848 = 0x80117848; +D_80117852 = 0x80117852; +D_801512B0 = 0x801512B0; +D_801512B4 = 0x801512B4; +gCurrentCustomModelGfxBuilders = 0x801512B8; +D_801512BC = 0x801512BC; +D_801512C0 = 0x801512C0; +D_801512C4 = 0x801512C4; +D_801512C8 = 0x801512C8; +gCurrentModelListPtr = 0x801512CC; +D_801512D0 = 0x801512D0; +D_801512D4 = 0x801512D4; +gMsgBGScrollAmtX = 0x801512D8; +D_801512DA = 0x801512DA; +gCurrentTransformGroups = 0x801512E0; +gMsgGlobalWaveCounter = 0x801512E4; +gCurrentModelSpecialDlsPtr = 0x801512E8; +gLastCreatedEntityIndex = 0x801512EC; +D_801512F0 = 0x801512F0; +gMsgVarImages = 0x801512F4; +D_801512F8 = 0x801512F8; +D_801512FC = 0x801512FC; +D_80151300 = 0x80151300; +D_80151304 = 0x80151304; +D_80151308 = 0x80151308; +gMsgBGScrollAmtY = 0x8015130C; +D_8015130E = 0x8015130E; +D_80151310 = 0x80151310; +D_80151314 = 0x80151314; +gEntityModelCount = 0x80151318; +D_8015131C = 0x8015131C; +D_80151324 = 0x80151324; +D_80151328 = 0x80151328; +D_8015132C = 0x8015132C; +D_80151330 = 0x80151330; +gTriggerCount = 0x80151334; +D_80151338 = 0x80151338; +D_8015133C = 0x8015133C; +gCurrentDoorSoundsSet = 0x80151340; +D_80151344 = 0x80151344; +gWorldEntityList = 0x80151380; +gBattleEntityList = 0x801513F8; +gCurrentEntityListPtr = 0x80151470; +gWorldShadowList = 0x80151478; +gBattleShadowList = 0x80151568; +gCurrentShadowListPtr = 0x80151658; +D_8015165C = 0x8015165C; +D_80151660 = 0x80151660; +D_80151668 = 0x80151668; +D_801516DC = 0x801516DC; +D_801516E8 = 0x801516E8; +D_801516F4 = 0x801516F4; +D_801516FC = 0x801516FC; +gMainGameState = 0x80151700; +D_80151740 = 0x80151740; +gWorldModelList = 0x80151770; +gBattleModelList = 0x80151B70; +D_80151F70 = 0x80151F70; +D_80151F80 = 0x80151F80; +gWorldModelSpecialDls = 0x80151F90; +gBattleModelSpecialDls = 0x80152010; +D_80152090 = 0x80152090; +D_80152110 = 0x80152110; +D_80152190 = 0x80152190; +D_801521D0 = 0x801521D0; +D_80152210 = 0x80152210; +D_80152214 = 0x80152214; +D_80152218 = 0x80152218; +D_80152220 = 0x80152220; +D_80152A20 = 0x80152A20; +D_80153220 = 0x80153220; +D_80153221 = 0x80153221; +D_80153224 = 0x80153224; +D_80153226 = 0x80153226; +D_80153228 = 0x80153228; +D_80153248 = 0x80153248; +wFog = 0x80153264; +texPannerMainU = 0x80153268; +texPannerMainV = 0x801532A8; +texPannerAuxU = 0x801532E8; +texPannerAuxV = 0x80153328; +D_80153368 = 0x80153368; +D_8015336C = 0x8015336C; +D_8015336E = 0x8015336E; +D_80153370 = 0x80153370; +D_80153374 = 0x80153374; +D_80153376 = 0x80153376; +D_80153380 = 0x80153380; +D_801533A0 = 0x801533A0; +D_801533A8 = 0x801533A8; +D_801533AC = 0x801533AC; +D_801533B0 = 0x801533B0; +D_801533C0 = 0x801533C0; +D_801536B8 = 0x801536B8; +D_801536C0 = 0x801536C0; +D_801539B8 = 0x801539B8; +D_801539C0 = 0x801539C0; +D_80153A00 = 0x80153A00; +gCurrentAnimMeshListPtr = 0x80153A40; +D_80153A44 = 0x80153A44; +D_80153A48 = 0x80153A48; +D_80153A4B = 0x80153A4B; +D_80153A4C = 0x80153A4C; +D_80153A4F = 0x80153A4F; +D_80153A50 = 0x80153A50; +D_80153A53 = 0x80153A53; +D_80153A54 = 0x80153A54; +D_80153A57 = 0x80153A57; +D_80153A58 = 0x80153A58; +D_80153A5C = 0x80153A5C; +D_80153A60 = 0x80153A60; +D_80153A68 = 0x80153A68; +D_80153AA8 = 0x80153AA8; +D_80153AE8 = 0x80153AE8; +D_80153B28 = 0x80153B28; +D_80153B68 = 0x80153B68; +gWorldEntityModelList = 0x80153B70; +gBattleEntityModelList = 0x80153F70; +gCurrentEntityModelList = 0x80154370; +D_80154374 = 0x80154374; +entity_fog_enabled = 0x80154378; +entity_fog_red = 0x8015437C; +D_8015437F = 0x8015437F; +entity_fog_green = 0x80154380; +D_80154383 = 0x80154383; +entity_fog_blue = 0x80154384; +D_80154387 = 0x80154387; +entity_fog_alpha = 0x80154388; +D_8015438B = 0x8015438B; +entity_fog_dist_min = 0x8015438C; +entity_fog_dist_max = 0x80154390; +gWorldDynamicEntityList = 0x801543A0; +gBattleDynamicEntityList = 0x801543E0; +gCurrentDynamicEntityListPtr = 0x80154420; +gMessageBuffers = 0x80154430; +gMessagePrinters = 0x80154C30; +gMessageStringVars = 0x80155C38; +D_80155C98 = 0x80155C98; +gMessageWindowProjMatrix = 0x80155CA0; +D_80155D20 = 0x80155D20; +gMessageDrawStatePtr = 0x80155D74; +D_80155D80 = 0x80155D80; +D_80155D84 = 0x80155D84; +D_80155D88 = 0x80155D88; +D_80155D8C = 0x80155D8C; +D_80155D8E = 0x80155D8E; +D_80155D90 = 0x80155D90; +D_80155DA0 = 0x80155DA0; +D_801561A0 = 0x801561A0; +D_801565A0 = 0x801565A0; +D_801565A4 = 0x801565A4; +D_801565A6 = 0x801565A6; +D_801565A8 = 0x801565A8; +D_801565B0 = 0x801565B0; +D_801568E0 = 0x801568E0; +D_801568E4 = 0x801568E4; +D_801568E8 = 0x801568E8; +D_801568EC = 0x801568EC; +D_801568F0 = 0x801568F0; +D_801568F4 = 0x801568F4; +D_801568F8 = 0x801568F8; +D_80156900 = 0x80156900; +D_80156903 = 0x80156903; +D_80156904 = 0x80156904; +D_80156908 = 0x80156908; +D_8015690B = 0x8015690B; +D_8015690C = 0x8015690C; +D_80156948 = 0x80156948; +D_80156950 = 0x80156950; +D_80156954 = 0x80156954; +D_80156958 = 0x80156958; +D_80156960 = 0x80156960; +D_80156968 = 0x80156968; +D_80156970 = 0x80156970; +D_80156980 = 0x80156980; +D_80156F20 = 0x80156F20; +D_80156F60 = 0x80156F60; +D_80157460 = 0x80157460; +hudElements = 0x80157960; +D_80157964 = 0x80157964; +D_80157968 = 0x80157968; +D_80157970 = 0x80157970; +D_80157F70 = 0x80157F70; +D_80158570 = 0x80158570; +D_80158574 = 0x80158574; +D_80158580 = 0x80158580; +D_80158B80 = 0x80158B80; +D_80159180 = 0x80159180; +gTriggerList1 = 0x80159190; +gTriggerList2 = 0x80159290; +gCurrentTriggerListPtr = 0x80159390; +D_801593A0 = 0x801593A0; +D_8015959E = 0x8015959E; +D_801595A0 = 0x801595A0; +D_801595C0 = 0x801595C0; +D_80159670 = 0x80159670; +D_80159720 = 0x80159720; +D_801597D0 = 0x801597D0; +D_80159880 = 0x80159880; +D_801598A0 = 0x801598A0; +D_801599B8 = 0x801599B8; +D_80159AD0 = 0x80159AD0; +D_80159AD4 = 0x80159AD4; +gMusicUnkVolume = 0x80159AE0; +gMusicTargetVolume = 0x80159AE2; +gMusicUnkVolume2 = 0x80159AE4; +gMusicCurrentVolume = 0x80159AE6; +gMusicSettings = 0x80159AF0; +D_80159B08 = 0x80159B08; +D_80159B50 = 0x80159B50; +gUIPanels = 0x80159D50; +D_80159D54 = 0x80159D54; +D_80159E7E = 0x80159E7E; +D_8015A010 = 0x8015A010; +D_8015A070 = 0x8015A070; +D_8015A07C = 0x8015A07C; +D_8015A1E2 = 0x8015A1E2; +D_8015A2BC = 0x8015A2BC; +D_8015A2BE = 0x8015A2BE; +D_8015A2D0 = 0x8015A2D0; +D_8015A370 = 0x8015A370; +gCollisionStatus = 0x8015A550; +D_8015A578 = 0x8015A578; +D_8015A57A = 0x8015A57A; +D_8015A590 = 0x8015A590; +D_8015C74C = 0x8015C74C; +D_8015C790 = 0x8015C790; +D_8015C7A4 = 0x8015C7A4; +D_8015C7A8 = 0x8015C7A8; +D_8015C7C0 = 0x8015C7C0; +D_8015C7D0 = 0x8015C7D0; +D_8015C7D2 = 0x8015C7D2; +D_8015C7D8 = 0x8015C7D8; +D_8015C7E0 = 0x8015C7E0; +D_80164000 = 0x80164000; +D_80169B12 = 0x80169B12; +D_80169B16 = 0x80169B16; +D_80197000 = 0x80197000; +D_801A6000 = 0x801A6000; +D_801A7000 = 0x801A7000; +D_801AA000 = 0x801AA000; +D_80210000 = 0x80210000; +D_80219040 = 0x80219040; +D_80220740 = 0x80220740; +D_80220744 = 0x80220744; +D_80220750 = 0x80220750; +D_80220754 = 0x80220754; +D_80220760 = 0x80220760; +D_80220770 = 0x80220770; +D_80220780 = 0x80220780; +D_80224D60 = 0x80224D60; +D_80224D64 = 0x80224D64; +D_80224D70 = 0x80224D70; +D_80224D74 = 0x80224D74; +D_80224D80 = 0x80224D80; +D_80224D90 = 0x80224D90; +D_80224DA0 = 0x80224DA0; +D_80224DB0 = 0x80224DB0; +D_8022ADD0 = 0x8022ADD0; +D_8022B550 = 0x8022B550; +D_802310D0 = 0x802310D0; +D_80232C20 = 0x80232C20; +D_80232C4C = 0x80232C4C; +D_80232C50 = 0x80232C50; +D_80235E00 = 0x80235E00; +D_802367F0 = 0x802367F0; +D_8023BD70 = 0x8023BD70; +D_8023BD78 = 0x8023BD78; +D_8023BD98 = 0x8023BD98; +D_8023BDB4 = 0x8023BDB4; +D_8023BDB8 = 0x8023BDB8; +D_8023BDBC = 0x8023BDBC; +D_8023BDC0 = 0x8023BDC0; +D_8023BDC4 = 0x8023BDC4; +D_8023BDC8 = 0x8023BDC8; +D_8023C070 = 0x8023C070; +D_8023C1B0 = 0x8023C1B0; +D_8023C1B4 = 0x8023C1B4; +D_8023C1B8 = 0x8023C1B8; +D_8023C1BC = 0x8023C1BC; +D_8023C1C0 = 0x8023C1C0; +D_8023C1C4 = 0x8023C1C4; +D_8023C1C8 = 0x8023C1C8; +D_8023C1CC = 0x8023C1CC; +D_8023C1D0 = 0x8023C1D0; +D_8023CDA0 = 0x8023CDA0; +D_8023CDA4 = 0x8023CDA4; +D_8023D1E0 = 0x8023D1E0; +D_8023D1E4 = 0x8023D1E4; +D_8023D26C = 0x8023D26C; +D_8023D270 = 0x8023D270; +D_8023D274 = 0x8023D274; +D_8023D278 = 0x8023D278; +D_8023D27C = 0x8023D27C; +D_8023D280 = 0x8023D280; +D_8023D284 = 0x8023D284; +D_8023D288 = 0x8023D288; +D_8023D28C = 0x8023D28C; +D_8023D290 = 0x8023D290; +D_8023D294 = 0x8023D294; +D_8023D298 = 0x8023D298; +D_8023D29C = 0x8023D29C; +D_8023D2A0 = 0x8023D2A0; +D_8023D2A4 = 0x8023D2A4; +D_8023D2A8 = 0x8023D2A8; +D_8023D2AC = 0x8023D2AC; +D_8023D2B0 = 0x8023D2B0; +D_8023D2B4 = 0x8023D2B4; +D_8023D2B8 = 0x8023D2B8; +D_8023D2BC = 0x8023D2BC; +D_8023D2C0 = 0x8023D2C0; +D_8023D2C4 = 0x8023D2C4; +D_8023D2C8 = 0x8023D2C8; +D_8023D2D0 = 0x8023D2D0; +D_8023D330 = 0x8023D330; +D_8023D334 = 0x8023D334; +D_8023D338 = 0x8023D338; +D_80241ECC = 0x80241ECC; +D_80242208 = 0x80242208; +D_80242344 = 0x80242344; +D_802429BC = 0x802429BC; +D_802429E0 = 0x802429E0; +D_80242FB0 = 0x80242FB0; +D_80243190 = 0x80243190; +D_80243374 = 0x80243374; +D_80243720 = 0x80243720; +D_80243BE0 = 0x80243BE0; +D_802440E0 = 0x802440E0; +D_802440E1 = 0x802440E1; +D_802440E2 = 0x802440E2; +D_802440E3 = 0x802440E3; +D_802440E5 = 0x802440E5; +D_802440EB = 0x802440EB; +D_802440EF = 0x802440EF; +D_802440F3 = 0x802440F3; +D_802440F7 = 0x802440F7; +D_802440F8 = 0x802440F8; +D_802440FB = 0x802440FB; +D_802440FF = 0x802440FF; +D_80244104 = 0x80244104; +D_802442D0 = 0x802442D0; +D_80244494 = 0x80244494; +D_802447C0 = 0x802447C0; +D_80244A20 = 0x80244A20; +D_80244C18 = 0x80244C18; +D_80244D88 = 0x80244D88; +D_802451F0 = 0x802451F0; +D_80245230 = 0x80245230; +D_80245278 = 0x80245278; +D_802453D8 = 0x802453D8; +D_80245430 = 0x80245430; +D_80245601 = 0x80245601; +D_80245602 = 0x80245602; +D_80245603 = 0x80245603; +D_80245604 = 0x80245604; +D_80245605 = 0x80245605; +D_80245608 = 0x80245608; +D_8024560B = 0x8024560B; +D_8024560C = 0x8024560C; +D_8024560F = 0x8024560F; +D_80245610 = 0x80245610; +D_80245613 = 0x80245613; +D_80245614 = 0x80245614; +D_80245617 = 0x80245617; +D_80245618 = 0x80245618; +D_8024561B = 0x8024561B; +D_8024561C = 0x8024561C; +D_8024561F = 0x8024561F; +D_80245620 = 0x80245620; +D_80245650 = 0x80245650; +D_80245928 = 0x80245928; +D_8024592C = 0x8024592C; +D_802459C0 = 0x802459C0; +D_80245AB4 = 0x80245AB4; +D_802461F0 = 0x802461F0; +D_80246260 = 0x80246260; +D_802462F0 = 0x802462F0; +D_80246300 = 0x80246300; +D_80246424 = 0x80246424; +D_8024652C = 0x8024652C; +D_80246530 = 0x80246530; +D_80246534 = 0x80246534; +D_80246554 = 0x80246554; +D_8024655C = 0x8024655C; +D_80246578 = 0x80246578; +D_80246598 = 0x80246598; +D_8024659C = 0x8024659C; +D_802465A0 = 0x802465A0; +D_802465CC = 0x802465CC; +D_802465F0 = 0x802465F0; +D_802466D0 = 0x802466D0; +D_80246794 = 0x80246794; +D_802467B4 = 0x802467B4; +D_80246894 = 0x80246894; +D_80246990 = 0x80246990; +D_80246BE8 = 0x80246BE8; +D_80247050 = 0x80247050; +D_80247120 = 0x80247120; +D_802474A0 = 0x802474A0; +D_80247548 = 0x80247548; +D_80247664 = 0x80247664; +D_80247750 = 0x80247750; +D_802479F0 = 0x802479F0; +D_80247BF0 = 0x80247BF0; +D_80247CA0 = 0x80247CA0; +D_80247CB4 = 0x80247CB4; +D_80247D00 = 0x80247D00; +D_80247DF0 = 0x80247DF0; +D_80247E68 = 0x80247E68; +D_80248380 = 0x80248380; +D_80248388 = 0x80248388; +D_802483C0 = 0x802483C0; +D_802483C4 = 0x802483C4; +D_802483D0 = 0x802483D0; +D_80248480 = 0x80248480; +D_8024854C = 0x8024854C; +D_80248600 = 0x80248600; +D_80248624 = 0x80248624; +D_80248650 = 0x80248650; +D_80248850 = 0x80248850; +D_80248924 = 0x80248924; +D_80248938 = 0x80248938; +D_80248940 = 0x80248940; +D_80248944 = 0x80248944; +D_80248948 = 0x80248948; +D_80248F90 = 0x80248F90; +D_80249158 = 0x80249158; +D_80249440 = 0x80249440; +D_8024A290 = 0x8024A290; +D_8024A2A0 = 0x8024A2A0; +D_8024A2C4 = 0x8024A2C4; +D_8024A2D0 = 0x8024A2D0; +D_8024B990 = 0x8024B990; +D_8024B9B4 = 0x8024B9B4; +D_8024B9B8 = 0x8024B9B8; +D_8024BA90 = 0x8024BA90; +D_8024BB80 = 0x8024BB80; +D_8024BDD0 = 0x8024BDD0; +D_8024BDE8 = 0x8024BDE8; +D_8024BDF0 = 0x8024BDF0; +D_8024BDF4 = 0x8024BDF4; +D_8024BDF8 = 0x8024BDF8; +D_8024BEA0 = 0x8024BEA0; +D_8024C068 = 0x8024C068; +D_8024C080 = 0x8024C080; +D_8024C084 = 0x8024C084; +D_8024C088 = 0x8024C088; +D_8024C08C = 0x8024C08C; +D_8024C090 = 0x8024C090; +D_8024C094 = 0x8024C094; +D_8024C0B0 = 0x8024C0B0; +D_8024C108 = 0x8024C108; +D_8024C110 = 0x8024C110; +D_8024C117 = 0x8024C117; +D_8024C1D8 = 0x8024C1D8; +D_8024C5E0 = 0x8024C5E0; +D_8024DBC0 = 0x8024DBC0; +D_8024DD88 = 0x8024DD88; +D_8024DF10 = 0x8024DF10; +D_8024DF18 = 0x8024DF18; +D_8024DF1C = 0x8024DF1C; +D_8024DF20 = 0x8024DF20; +D_8024DF24 = 0x8024DF24; +D_8024DFC0 = 0x8024DFC0; +D_8024DFD8 = 0x8024DFD8; +D_8024DFE0 = 0x8024DFE0; +D_8024DFE4 = 0x8024DFE4; +D_8024DFE8 = 0x8024DFE8; +D_8024DFF0 = 0x8024DFF0; +D_8024E1B4 = 0x8024E1B4; +D_8024E540 = 0x8024E540; +D_8024E558 = 0x8024E558; +D_8024E560 = 0x8024E560; +D_8024E564 = 0x8024E564; +D_8024E568 = 0x8024E568; +D_8024E570 = 0x8024E570; +D_8024E738 = 0x8024E738; +D_8024E960 = 0x8024E960; +D_8024EA10 = 0x8024EA10; +D_8024EA14 = 0x8024EA14; +D_8024EA18 = 0x8024EA18; +gPauseMenuTabs = 0x8024EF80; +D_8024EF84 = 0x8024EF84; +D_8024EF88 = 0x8024EF88; +D_8024EF90 = 0x8024EF90; +gPauseMenuCursorPosY = 0x8024EFA0; +D_8024EFB8 = 0x8024EFB8; +D_8024EFC0 = 0x8024EFC0; +D_8024EFC8 = 0x8024EFC8; +D_8024F010 = 0x8024F010; +D_8024F080 = 0x8024F080; +D_8024F248 = 0x8024F248; +D_8024F2A0 = 0x8024F2A0; +D_8024F2A1 = 0x8024F2A1; +D_8024F2A2 = 0x8024F2A2; +D_8024F2A3 = 0x8024F2A3; +D_8024F2A4 = 0x8024F2A4; +D_8024F2A5 = 0x8024F2A5; +D_8024F2A8 = 0x8024F2A8; +D_8024F2AB = 0x8024F2AB; +D_8024F2AC = 0x8024F2AC; +D_8024F2AF = 0x8024F2AF; +D_8024F2B0 = 0x8024F2B0; +D_8024F2B3 = 0x8024F2B3; +D_8024F2B4 = 0x8024F2B4; +D_8024F2B7 = 0x8024F2B7; +D_8024F2B8 = 0x8024F2B8; +D_8024F2BB = 0x8024F2BB; +D_8024F2BC = 0x8024F2BC; +D_8024F2BF = 0x8024F2BF; +D_8024F2C4 = 0x8024F2C4; +D_8024F2C8 = 0x8024F2C8; +D_8024F2CC = 0x8024F2CC; +D_8024F2D8 = 0x8024F2D8; +D_8024F2DC = 0x8024F2DC; +D_8024F2E0 = 0x8024F2E0; +D_8024F2EC = 0x8024F2EC; +D_8024F2F4 = 0x8024F2F4; +D_8024F2F8 = 0x8024F2F8; +D_8024F2FC = 0x8024F2FC; +D_8024F304 = 0x8024F304; +D_8024F308 = 0x8024F308; +D_8024F30C = 0x8024F30C; +D_8024F318 = 0x8024F318; +D_8024F338 = 0x8024F338; +D_8024F358 = 0x8024F358; +D_8024F374 = 0x8024F374; +D_8024F378 = 0x8024F378; +D_8024F3F8 = 0x8024F3F8; +D_8024F448 = 0x8024F448; +D_8024F498 = 0x8024F498; +D_8024F4E8 = 0x8024F4E8; +D_8024F581 = 0x8024F581; +D_8024F582 = 0x8024F582; +D_8024F583 = 0x8024F583; +D_8024F584 = 0x8024F584; +D_8024F585 = 0x8024F585; +D_8024F588 = 0x8024F588; +D_8024F58B = 0x8024F58B; +D_8024F58C = 0x8024F58C; +D_8024F58F = 0x8024F58F; +D_8024F590 = 0x8024F590; +D_8024F593 = 0x8024F593; +D_8024F594 = 0x8024F594; +D_8024F597 = 0x8024F597; +D_8024F598 = 0x8024F598; +D_8024F59B = 0x8024F59B; +D_8024F59C = 0x8024F59C; +D_8024F59F = 0x8024F59F; +D_8024F5A0 = 0x8024F5A0; +D_8024F5A4 = 0x8024F5A4; +D_8024F5C4 = 0x8024F5C4; +D_8024F5C8 = 0x8024F5C8; +D_8024F5D0 = 0x8024F5D0; +D_8024F7E4 = 0x8024F7E4; +D_8024F7F0 = 0x8024F7F0; +D_8024FBA0 = 0x8024FBA0; +D_8024FD68 = 0x8024FD68; +D_8024FED8 = 0x8024FED8; +D_8024FEF0 = 0x8024FEF0; +D_8024FEF8 = 0x8024FEF8; +D_8024FEFC = 0x8024FEFC; +D_8024FF00 = 0x8024FF00; +D_8024FF04 = 0x8024FF04; +D_80250EF0 = 0x80250EF0; +D_802513D0 = 0x802513D0; +D_802513E8 = 0x802513E8; +D_802513F4 = 0x802513F4; +D_802513F8 = 0x802513F8; +D_80251400 = 0x80251400; +D_80251450 = 0x80251450; +D_80251468 = 0x80251468; +D_80251470 = 0x80251470; +D_80251478 = 0x80251478; +D_802515C4 = 0x802515C4; +D_80251C40 = 0x80251C40; +D_80251C58 = 0x80251C58; +D_80251C60 = 0x80251C60; +D_80251C68 = 0x80251C68; +D_80251C70 = 0x80251C70; +D_80251E34 = 0x80251E34; +D_802529D0 = 0x802529D0; +D_802529E8 = 0x802529E8; +D_802529F0 = 0x802529F0; +D_802529F4 = 0x802529F4; +D_80252A00 = 0x80252A00; +D_80252BC8 = 0x80252BC8; +D_80252D38 = 0x80252D38; +D_80253060 = 0x80253060; +D_80253378 = 0x80253378; +D_80253384 = 0x80253384; +D_8025338C = 0x8025338C; +D_80253390 = 0x80253390; +D_802547D0 = 0x802547D0; +D_802549B8 = 0x802549B8; +D_802549C4 = 0x802549C4; +D_802549C8 = 0x802549C8; +D_802549D0 = 0x802549D0; +D_80254B94 = 0x80254B94; +D_80254BA0 = 0x80254BA0; +D_80254D68 = 0x80254D68; +D_80255B70 = 0x80255B70; +D_80255B88 = 0x80255B88; +D_80255B90 = 0x80255B90; +D_80255B94 = 0x80255B94; +D_80255B98 = 0x80255B98; +D_80255BA0 = 0x80255BA0; +D_80255D68 = 0x80255D68; +D_80255ED8 = 0x80255ED8; +D_80255EE0 = 0x80255EE0; +D_802560A4 = 0x802560A4; +D_80257118 = 0x80257118; +D_80257320 = 0x80257320; +D_80257F20 = 0x80257F20; +D_80257F21 = 0x80257F21; +D_80257F22 = 0x80257F22; +D_80257F23 = 0x80257F23; +D_80257F24 = 0x80257F24; +D_80257F25 = 0x80257F25; +D_80257F26 = 0x80257F26; +D_80257F27 = 0x80257F27; +D_80257F28 = 0x80257F28; +D_80257F29 = 0x80257F29; +D_80257F2C = 0x80257F2C; +D_80257F40 = 0x80257F40; +D_80257F48 = 0x80257F48; +D_80257F4C = 0x80257F4C; +D_80257F50 = 0x80257F50; +D_80257F58 = 0x80257F58; +D_8025811C = 0x8025811C; +D_80258120 = 0x80258120; +D_80258140 = 0x80258140; +D_80258340 = 0x80258340; +D_8025B0A8 = 0x8025B0A8; +D_8025B2A8 = 0x8025B2A8; +D_8025B2AC = 0x8025B2AC; +D_8025B2B0 = 0x8025B2B0; +D_8025C0D0 = 0x8025C0D0; +D_80262A40 = 0x80262A40; +D_80262A58 = 0x80262A58; +D_80262A60 = 0x80262A60; +D_80262A64 = 0x80262A64; +D_80262A68 = 0x80262A68; +D_80262A70 = 0x80262A70; +D_80262C34 = 0x80262C34; +D_80262C38 = 0x80262C38; +D_80262F68 = 0x80262F68; +D_80268000 = 0x80268000; +gPauseMenuCommonIconIDs = 0x802700E8; +D_80270108 = 0x80270108; +D_8027010C = 0x8027010C; +D_80270110 = 0x80270110; +D_80270114 = 0x80270114; +D_80270118 = 0x80270118; +D_8027011C = 0x8027011C; +gPauseMenuTabIconIDs = 0x80270130; +D_80270148 = 0x80270148; +D_8027014C = 0x8027014C; +gStatsMenuIconIDs = 0x80270150; +gBadgeMenuItemIDs = 0x80270180; +gBadgeMenuCurrentPage = 0x80270280; +gBadgeMenuPages = 0x80270288; +D_80270289 = 0x80270289; +D_8027028A = 0x8027028A; +gBadgeMenuSelectedIndex = 0x80270378; +D_8027037C = 0x8027037C; +gBadgeMenuSelectedItemID = 0x80270380; +gBadgeMenuNumItems = 0x80270384; +D_80270388 = 0x80270388; +gBadgeMenuCurrentScrollPos = 0x8027038C; +gBadgeMenuTargetScrollPos = 0x80270390; +D_80270394 = 0x80270394; +gBadgeMenuLevel = 0x80270398; +gBadgeMenuCurrentTab = 0x8027039C; +gBadgeMenuBShowNotEnoughBP = 0x802703A0; +D_802703A8 = 0x802703A8; +D_802703FC = 0x802703FC; +gItemMenuItemIDs = 0x80270400; +gItemMenuCurrentPage = 0x802704C8; +gItemMenuPages = 0x802704D0; +D_802704D1 = 0x802704D1; +D_802704D2 = 0x802704D2; +gItemMenuSelectedIndex = 0x802705C0; +D_802705C4 = 0x802705C4; +gItemMenuSelectedItemID = 0x802705C8; +gItemMenuNumItems = 0x802705CC; +D_802705D0 = 0x802705D0; +gItemMenuCurrentScrollPos = 0x802705D4; +gItemMenuTargetScrollPos = 0x802705D8; +D_802705DC = 0x802705DC; +gItemMenuLevel = 0x802705E0; +gItemMenuCurrentTab = 0x802705E4; +gItemIcons = 0x802705E8; +D_80270634 = 0x80270634; +D_80270640 = 0x80270640; +D_80270660 = 0x80270660; +D_80270680 = 0x80270680; +D_802706A0 = 0x802706A0; +D_802706A4 = 0x802706A4; +D_802706A8 = 0x802706A8; +D_802706AC = 0x802706AC; +D_802706B0 = 0x802706B0; +D_802706C0 = 0x802706C0; +D_802706E0 = 0x802706E0; +D_802706FC = 0x802706FC; +D_80270700 = 0x80270700; +D_80270704 = 0x80270704; +D_80270708 = 0x80270708; +D_8027070C = 0x8027070C; +D_80270710 = 0x80270710; +D_80270714 = 0x80270714; +D_80270718 = 0x80270718; +D_8027071C = 0x8027071C; +D_80270720 = 0x80270720; +D_80270724 = 0x80270724; +D_80282EE9 = 0x80282EE9; +D_80282EEA = 0x80282EEA; +bMarioHideAnims = 0x80283370; +D_8029DA30 = 0x8029DA30; +D_8029DA33 = 0x8029DA33; +D_8029DA34 = 0x8029DA34; +D_8029DA40 = 0x8029DA40; +D_8029DA44 = 0x8029DA44; +D_8029DA48 = 0x8029DA48; +D_8029DA4C = 0x8029DA4C; +D_8029DA50 = 0x8029DA50; +D_8029EFB0 = 0x8029EFB0; +D_8029EFB4 = 0x8029EFB4; +D_8029EFB8 = 0x8029EFB8; +D_8029EFBC = 0x8029EFBC; +D_8029EFC0 = 0x8029EFC0; +D_8029EFE8 = 0x8029EFE8; +D_8029F010 = 0x8029F010; +D_8029F038 = 0x8029F038; +D_8029F236 = 0x8029F236; +D_8029F240 = 0x8029F240; +D_8029F244 = 0x8029F244; +D_8029F248 = 0x8029F248; +D_8029F24C = 0x8029F24C; +D_8029F250 = 0x8029F250; +D_8029F254 = 0x8029F254; +D_8029F258 = 0x8029F258; +D_8029F25C = 0x8029F25C; +D_8029F260 = 0x8029F260; +D_8029F264 = 0x8029F264; +D_8029F270 = 0x8029F270; +D_8029F274 = 0x8029F274; +D_8029F278 = 0x8029F278; +D_8029F27C = 0x8029F27C; +D_8029F27E = 0x8029F27E; +D_8029F280 = 0x8029F280; +D_8029F282 = 0x8029F282; +D_8029F284 = 0x8029F284; +D_8029F286 = 0x8029F286; +D_8029F288 = 0x8029F288; +D_8029F28C = 0x8029F28C; +D_8029F290 = 0x8029F290; +D_8029F294 = 0x8029F294; +D_8029F298 = 0x8029F298; +D_8029F29C = 0x8029F29C; +D_8029F29E = 0x8029F29E; +D_8029F2A0 = 0x8029F2A0; +D_8029F2A2 = 0x8029F2A2; +D_8029F2A3 = 0x8029F2A3; +D_8029F2A4 = 0x8029F2A4; +D_8029F2A5 = 0x8029F2A5; +D_8029F2A6 = 0x8029F2A6; +D_8029F2A7 = 0x8029F2A7; +D_8029F2A8 = 0x8029F2A8; +D_8029F2AC = 0x8029F2AC; +D_8029F2B0 = 0x8029F2B0; +D_8029F2B4 = 0x8029F2B4; +D_8029F2C0 = 0x8029F2C0; +D_8029F640 = 0x8029F640; +D_8029F642 = 0x8029F642; +D_8029F644 = 0x8029F644; +D_8029F646 = 0x8029F646; +D_8029F648 = 0x8029F648; +D_8029F64A = 0x8029F64A; +D_8029F64C = 0x8029F64C; +D_8029F64E = 0x8029F64E; +D_8029F650 = 0x8029F650; +gSpeakingActorPrintCtx = 0x8029FA60; +D_8029FA64 = 0x8029FA64; +gSpeakingActorPrintIsDone = 0x8029FA68; +gSpeakingActorTalkAnim = 0x8029FA6C; +gSpeakingActorIdleAnim = 0x8029FA70; +gSpeakingActor = 0x8029FA74; +gSpeakingActorPart = 0x8029FA78; +D_8029FA80 = 0x8029FA80; +D_8029FA88 = 0x8029FA88; +D_8029FA90 = 0x8029FA90; +D_8029FAA8 = 0x8029FAA8; +D_8029FAC4 = 0x8029FAC4; +D_8029FAE8 = 0x8029FAE8; +D_8029FB48 = 0x8029FB48; +D_8029FB4C = 0x8029FB4C; +D_8029FB50 = 0x8029FB50; +D_8029FB54 = 0x8029FB54; +D_8029FB60 = 0x8029FB60; +D_8029FB64 = 0x8029FB64; +D_8029FB68 = 0x8029FB68; +D_8029FB6C = 0x8029FB6C; +D_8029FB70 = 0x8029FB70; +D_8029FB74 = 0x8029FB74; +D_8029FB78 = 0x8029FB78; +D_8029FB7C = 0x8029FB7C; +D_8029FB80 = 0x8029FB80; +D_8029FB84 = 0x8029FB84; +D_8029FB88 = 0x8029FB88; +D_8029FB8C = 0x8029FB8C; +D_8029FB90 = 0x8029FB90; +D_8029FB94 = 0x8029FB94; +D_8029FB98 = 0x8029FB98; +D_8029FB9C = 0x8029FB9C; +D_8029FBA0 = 0x8029FBA0; +D_8029FBA4 = 0x8029FBA4; +D_8029FBA8 = 0x8029FBA8; +D_8029FBAC = 0x8029FBAC; +D_8029FBB0 = 0x8029FBB0; +D_8029FBC0 = 0x8029FBC0; +D_8029FBD0 = 0x8029FBD0; +D_8029FBD4 = 0x8029FBD4; +gActionCommandStatus = 0x8029FBE0; +D_8029FBE4 = 0x8029FBE4; +D_8029FC2A = 0x8029FC2A; +D_8029FC3E = 0x8029FC3E; +D_8029FC4C = 0x8029FC4C; +D_802A18E0 = 0x802A18E0; +D_802A19B0 = 0x802A19B0; +D_802A19C0 = 0x802A19C0; +D_802A1A90 = 0x802A1A90; +D_802A1AA0 = 0x802A1AA0; +D_802A1AC0 = 0x802A1AC0; +D_802A1B40 = 0x802A1B40; +D_802A1C90 = 0x802A1C90; +D_802A1CA0 = 0x802A1CA0; +D_802A1CD0 = 0x802A1CD0; +D_802A1CD4 = 0x802A1CD4; +D_802A1D60 = 0x802A1D60; +D_802A1D70 = 0x802A1D70; +D_802A1E70 = 0x802A1E70; +D_802A1E80 = 0x802A1E80; +D_802A1EB0 = 0x802A1EB0; +D_802A1EE0 = 0x802A1EE0; +D_802A2120 = 0x802A2120; +D_802A21C0 = 0x802A21C0; +D_802A21F0 = 0x802A21F0; +D_802A2410 = 0x802A2410; +D_802A24D0 = 0x802A24D0; +D_802A25C0 = 0x802A25C0; +D_802A25C8 = 0x802A25C8; +D_802A25E4 = 0x802A25E4; +D_802A25E8 = 0x802A25E8; +D_802A25EC = 0x802A25EC; +D_802A25F0 = 0x802A25F0; +D_802A25F4 = 0x802A25F4; +D_802A25F8 = 0x802A25F8; +D_802A25FC = 0x802A25FC; +D_802A2890 = 0x802A2890; +D_802A2C20 = 0x802A2C20; +D_802A2C50 = 0x802A2C50; +D_802A2CC0 = 0x802A2CC0; +D_802A2DD0 = 0x802A2DD0; +D_802A2DD8 = 0x802A2DD8; +D_802A2DEC = 0x802A2DEC; +D_802A2DF0 = 0x802A2DF0; +D_802A2DF4 = 0x802A2DF4; +D_802A2DF8 = 0x802A2DF8; +D_802A2DFC = 0x802A2DFC; +D_802A2E00 = 0x802A2E00; +D_802A37F0 = 0x802A37F0; +D_802A37F8 = 0x802A37F8; +D_802A3818 = 0x802A3818; +D_802A3834 = 0x802A3834; +D_802A3838 = 0x802A3838; +D_802A3F50 = 0x802A3F50; +D_802A3F58 = 0x802A3F58; +D_802A3F88 = 0x802A3F88; +D_802A4020 = 0x802A4020; +D_802A4350 = 0x802A4350; +D_802A43D0 = 0x802A43D0; +D_802A9620 = 0x802A9620; +D_802A98C0 = 0x802A98C0; +D_802A9920 = 0x802A9920; +D_802A9B00 = 0x802A9B00; +D_802A9F0C = 0x802A9F0C; +D_802A9F34 = 0x802A9F34; +D_802A9F5C = 0x802A9F5C; +D_802A9F84 = 0x802A9F84; +D_802A9FAC = 0x802A9FAC; +D_802AA320 = 0x802AA320; +D_802AA694 = 0x802AA694; +D_802AAA08 = 0x802AAA08; +D_802AAA30 = 0x802AAA30; +D_802ACC60 = 0x802ACC60; +D_802ACC64 = 0x802ACC64; +D_802ACC68 = 0x802ACC68; +D_802ACC6C = 0x802ACC6C; +D_802ACC70 = 0x802ACC70; +D_802ACCD0 = 0x802ACCD0; +D_802ACFE8 = 0x802ACFE8; +D_802ACFEC = 0x802ACFEC; +D_802ACFF0 = 0x802ACFF0; +D_802ACFF4 = 0x802ACFF4; +D_802ACFFC = 0x802ACFFC; +D_802ACFFD = 0x802ACFFD; +D_802AD000 = 0x802AD000; +D_802AD001 = 0x802AD001; +D_802AD002 = 0x802AD002; +D_802AD003 = 0x802AD003; +D_802AD004 = 0x802AD004; +D_802AD006 = 0x802AD006; +D_802AD008 = 0x802AD008; +D_802AD00A = 0x802AD00A; +D_802AD010 = 0x802AD010; +D_802AD028 = 0x802AD028; +D_802AD040 = 0x802AD040; +D_802AD044 = 0x802AD044; +D_802AD048 = 0x802AD048; +D_802AD04C = 0x802AD04C; +D_802AD050 = 0x802AD050; +D_802AD054 = 0x802AD054; +D_802AD058 = 0x802AD058; +D_802AD05C = 0x802AD05C; +D_802AD060 = 0x802AD060; +D_802AD064 = 0x802AD064; +D_802AD068 = 0x802AD068; +D_802AD069 = 0x802AD069; +D_802AD06A = 0x802AD06A; +D_802AD06B = 0x802AD06B; +D_802AD06C = 0x802AD06C; +D_802AD070 = 0x802AD070; +main_battle_menu_iconScripts = 0x802AD078; +battle_menu_messageIDs = 0x802AD090; +D_802AD0A8 = 0x802AD0A8; +main_menu_numOptions = 0x802AD0AC; +D_802AD0B0 = 0x802AD0B0; +D_802AD0B3 = 0x802AD0B3; +battle_menu_submenuIDs = 0x802AD0B8; +D_802AD0BB = 0x802AD0BB; +D_802AD0BC = 0x802AD0BC; +D_802AD0C0 = 0x802AD0C0; +battle_menu_isEnabled = 0x802AD0D0; +battle_menu_isMessageDisabled = 0x802AD0E8; +D_802AD0EB = 0x802AD0EB; +D_802AD100 = 0x802AD100; +D_802AD104 = 0x802AD104; +battle_menu_moveState = 0x802AD108; +battle_menu_moveCursorPos = 0x802AD109; +D_802AD10A = 0x802AD10A; +D_802AD10B = 0x802AD10B; +battle_menu_moveScrollLine = 0x802AD10C; +D_802AD10D = 0x802AD10D; +D_802AD10E = 0x802AD10E; +D_802AD10F = 0x802AD10F; +battle_menu_moveScrollOffset = 0x802AD110; +D_802AD112 = 0x802AD112; +battle_menu_moveTextColor = 0x802AD114; +battle_menu_moveTextOpacity = 0x802AD116; +battle_menu_moveCursorIcon = 0x802AD118; +battle_menu_moveUpArrowIcon = 0x802AD11C; +battle_menu_moveDownArrowIcon = 0x802AD120; +battle_menu_moveOptionIconIDs = 0x802AD128; +battle_menu_moveTitleIcon = 0x802AD188; +battle_menu_moveOptionCostUnitIconIDs = 0x802AD190; +battle_menu_moveX = 0x802AD1F0; +battle_menu_moveY = 0x802AD1F2; +battle_menu_moveOptionIndexMap = 0x802AD1F8; +D_802AD258 = 0x802AD258; +battle_menu_moveOptionIconScripts = 0x802AD260; +battle_menu_moveOptionNames = 0x802AD2C0; +battle_menu_moveOptionDisplayCosts = 0x802AD320; +battle_menu_moveOptionDisplayCostReductions = 0x802AD380; +battle_menu_moveOptionDisplayCostReductionColors = 0x802AD3E0; +battle_menu_moveOptionBPCosts = 0x802AD440; +battle_menu_hasSpiritsMenu = 0x802AD4A0; +battle_menu_moveOptionCount = 0x802AD4A4; +D_802AD4A7 = 0x802AD4A7; +D_802AD4A8 = 0x802AD4A8; +battle_menu_moveIndices = 0x802AD4B0; +D_802AD4B2 = 0x802AD4B2; +D_802AD4B3 = 0x802AD4B3; +battle_menu_moveOptionsEnabled = 0x802AD510; +battle_menu_moveOptionDescriptions = 0x802AD570; +battle_menu_moveOptionSortPriorities = 0x802AD5D0; +battle_menu_moveOptionCantUseTypes = 0x802AD5E8; +battle_menu_moveOptionActive = 0x802AD600; +D_802AD603 = 0x802AD603; +D_802AD604 = 0x802AD604; +D_802AD605 = 0x802AD605; +D_802AD606 = 0x802AD606; +D_802AD607 = 0x802AD607; +D_802AD608 = 0x802AD608; +D_802AD609 = 0x802AD609; +D_802AD60A = 0x802AD60A; +D_802AD60B = 0x802AD60B; +D_802AD60C = 0x802AD60C; +D_802AD60E = 0x802AD60E; +D_802AD610 = 0x802AD610; +D_802AD612 = 0x802AD612; +D_802AD614 = 0x802AD614; +D_802AD618 = 0x802AD618; +D_802AD61C = 0x802AD61C; +D_802AD620 = 0x802AD620; +D_802AD624 = 0x802AD624; +D_802AD628 = 0x802AD628; +D_802AD63C = 0x802AD63C; +D_802AD63E = 0x802AD63E; +D_802AD640 = 0x802AD640; +D_802AD658 = 0x802AD658; +D_802AD66C = 0x802AD66C; +D_802AD66F = 0x802AD66F; +D_802AD670 = 0x802AD670; +D_802AD673 = 0x802AD673; +D_802AD678 = 0x802AD678; +D_802AD67B = 0x802AD67B; +D_802AD690 = 0x802AD690; +D_802AD6A8 = 0x802AD6A8; +D_802AD6AA = 0x802AD6AA; +D_802AD6C0 = 0x802AD6C0; +D_802AD6D4 = 0x802AD6D4; +D_802B6240 = 0x802B6240; +D_802B62B0 = 0x802B62B0; +D_802B62D0 = 0x802B62D0; +D_802B62D4 = 0x802B62D4; +D_802B62D8 = 0x802B62D8; +D_802B62DC = 0x802B62DC; +D_802B62E0 = 0x802B62E0; +D_802B6730 = 0x802B6730; +D_802B6780 = 0x802B6780; +D_802B6784 = 0x802B6784; +D_802B6788 = 0x802B6788; +D_802B678C = 0x802B678C; +D_802B6790 = 0x802B6790; +D_802B6794 = 0x802B6794; +D_802B6798 = 0x802B6798; +D_802B679C = 0x802B679C; +D_802B68B0 = 0x802B68B0; +D_802B68B4 = 0x802B68B4; +D_802B68B8 = 0x802B68B8; +D_802B68BC = 0x802B68BC; +D_802B6E80 = 0x802B6E80; +D_802B6ED0 = 0x802B6ED0; +D_802B6ED4 = 0x802B6ED4; +D_802B6ED8 = 0x802B6ED8; +D_802B6EDC = 0x802B6EDC; +D_802B6EE0 = 0x802B6EE0; +D_802B6EE4 = 0x802B6EE4; +D_802B6EE8 = 0x802B6EE8; +D_802B6EEC = 0x802B6EEC; +D_802B6EF0 = 0x802B6EF0; +D_802B6EF4 = 0x802B6EF4; +D_802B9E00 = 0x802B9E00; +D_802BDF30 = 0x802BDF30; +D_802BDF34 = 0x802BDF34; +D_802BDF38 = 0x802BDF38; +D_802BDF60 = 0x802BDF60; +D_802BE0C0 = 0x802BE0C0; +D_802BE0C4 = 0x802BE0C4; +D_802BE0E4 = 0x802BE0E4; +D_802BE0E8 = 0x802BE0E8; +D_802BE0EC = 0x802BE0EC; +D_802BE300 = 0x802BE300; +D_802BE304 = 0x802BE304; +D_802BE308 = 0x802BE308; +D_802BE30C = 0x802BE30C; +D_802BE310 = 0x802BE310; +D_802BE920 = 0x802BE920; +D_802BE924 = 0x802BE924; +D_802BE928 = 0x802BE928; +D_802BE92C = 0x802BE92C; +D_802BE930 = 0x802BE930; +D_802BE934 = 0x802BE934; +D_802BE938 = 0x802BE938; +D_802BEBB0 = 0x802BEBB0; +D_802BEBB4 = 0x802BEBB4; +D_802BEBB8 = 0x802BEBB8; +D_802BEBBC = 0x802BEBBC; +D_802BEBC4 = 0x802BEBC4; +D_802BEC50 = 0x802BEC50; +D_802BEC54 = 0x802BEC54; +D_802BEC58 = 0x802BEC58; +D_802BEC5C = 0x802BEC5C; +D_802BEC60 = 0x802BEC60; +D_802BEC64 = 0x802BEC64; +D_802BEC68 = 0x802BEC68; +D_802BEC6C = 0x802BEC6C; +D_802BEC70 = 0x802BEC70; +D_802BEC74 = 0x802BEC74; +D_802BEC78 = 0x802BEC78; +D_802BFF00 = 0x802BFF00; +D_802BFF04 = 0x802BFF04; +D_802BFF08 = 0x802BFF08; +D_802BFF0C = 0x802BFF0C; +D_802BFF10 = 0x802BFF10; +D_802BFF14 = 0x802BFF14; +D_802BFF18 = 0x802BFF18; +D_802BFF1C = 0x802BFF1C; +D_802BFF20 = 0x802BFF20; +D_802BFF24 = 0x802BFF24; +D_802BFF28 = 0x802BFF28; +D_802C0000 = 0x802C0000; +D_802C05CC = 0x802C05CC; +gMapFlags = 0x802DA480; +gMapVars = 0x802DA484; +gNumScripts = 0x802DA488; +gWorldScriptList = 0x802DA490; +gBattleScriptList = 0x802DA690; +gCurrentScriptListPtr = 0x802DA890; +gScriptIndexList = 0x802DA898; +gScriptIdList = 0x802DAA98; +gScriptListCount = 0x802DAC98; +D_802DACA0 = 0x802DACA0; +gLavaResetList = 0x802DADA0; +D_802DADA4 = 0x802DADA4; +gBattleMeshAnimationList = 0x802DADB0; +gWorldMeshAnimationList = 0x802DADF0; +gCurrentMeshAnimationListPtr = 0x802DAE30; +D_802DAE40 = 0x802DAE40; +D_802DAE44 = 0x802DAE44; +D_802DAE50 = 0x802DAE50; +D_802DAE54 = 0x802DAE54; +gCurrentPrintContext = 0x802DB260; +D_802DB264 = 0x802DB264; +D_802DB268 = 0x802DB268; +D_802DB5B0 = 0x802DB5B0; +D_802DB5C0 = 0x802DB5C0; +D_802DB6C0 = 0x802DB6C0; +D_802DB7C0 = 0x802DB7C0; +D_802DB7D0 = 0x802DB7D0; +D_802DB7D8 = 0x802DB7D8; +D_802DB800 = 0x802DB800; +D_802DB830 = 0x802DB830; +D_802DBB60 = 0x802DBB60; +D_802DBB68 = 0x802DBB68; +gWorldMapFlags = 0x802DBC70; +D_802DBC7C = 0x802DBC7C; +D_802DBC88 = 0x802DBC88; +gWorldMapVars = 0x802DBCA8; +gBattleMapVars = 0x802DBCE8; +D_802DBD28 = 0x802DBD28; +gBattleMapFlags = 0x802DBD34; +spr_allocateBtlComponentsOnWorldHeap = 0x802DF524; +D_802DF530 = 0x802DF530; +D_802DF540 = 0x802DF540; +spr_playerSprites = 0x802DF548; +D_802DF578 = 0x802DF578; +D_802DF57C = 0x802DF57C; +spr_playerMaxComponents = 0x802DF580; +spr_playerCurrentAnimInfo = 0x802DF588; +D_802DF58C = 0x802DF58C; +D_802DF590 = 0x802DF590; +spr_npcSprites = 0x802DF5B0; +spr_npcSpriteInstanceCount = 0x802DF958; +D_802DFA48 = 0x802DFA48; +D_802DFA4C = 0x802DFA4C; +D_802DFA58 = 0x802DFA58; +D_802DFE44 = 0x802DFE44; +D_802DFE48 = 0x802DFE48; +D_802DFE9C = 0x802DFE9C; +D_802DFEA0 = 0x802DFEA0; +D_802DFEAC = 0x802DFEAC; +D_802DFEB0 = 0x802DFEB0; +D_802DFEB8 = 0x802DFEB8; +D_802E004C = 0x802E004C; +D_802E0050 = 0x802E0050; +D_802E0080 = 0x802E0080; +D_802E0090 = 0x802E0090; +D_802E0C10 = 0x802E0C10; +D_802E0C14 = 0x802E0C14; +D_802E0C20 = 0x802E0C20; +D_802E0C58 = 0x802E0C58; +D_802E0C5C = 0x802E0C5C; +D_802E0C60 = 0x802E0C60; +D_802E0C64 = 0x802E0C64; +D_802E0C68 = 0x802E0C68; +D_802E0C70 = 0x802E0C70; +D_802EB390 = 0x802EB390; +D_802EB394 = 0x802EB394; +D_802EB398 = 0x802EB398; +D_802EB39C = 0x802EB39C; +D_802EB3A0 = 0x802EB3A0; +D_802EB3B0 = 0x802EB3B0; +D_802EB3C0 = 0x802EB3C0; +D_802ED970 = 0x802ED970; +D_802EE8D0 = 0x802EE8D0; +D_802F39D0 = 0x802F39D0; +D_802F4560 = 0x802F4560; +D_802FB800 = 0x802FB800; +gSpriteHeapPtr = 0x8034F800; +D_803DA800 = 0x803DA800; +D_8887FFFB = 0x8887FFFB; +D_A0000000 = 0xA0000000; +D_A4000000 = 0xA4000000; +D_A4000768 = 0xA4000768; +D_A4001000 = 0xA4001000; +D_A4040010 = 0xA4040010; +D_A4300000 = 0xA4300000; +D_A4300004 = 0xA4300004; +D_A4300008 = 0xA4300008; +D_A430000C = 0xA430000C; +D_A4400010 = 0xA4400010; +D_A450000C = 0xA450000C; +D_A4600004 = 0xA4600004; +D_A460000C = 0xA460000C; +D_A4600010 = 0xA4600010; +D_A4700000 = 0xA4700000; +D_A4700010 = 0xA4700010; +D_A4800018 = 0xA4800018; +D_A6000000 = 0xA6000000; +D_B0000000 = 0xB0000000; +D_B0000008 = 0xB0000008; +D_B0000010 = 0xB0000010; +D_D9FCFFFF = 0xD9FCFFFF; +D_E001C5E0 = 0xE001C5E0; +D_E007EC2F = 0xE007EC2F; +D_E00963E0 = 0xE00963E0; +D_E1000010 = 0xE1000010; +D_E7000008 = 0xE7000008; +D_E8000008 = 0xE8000008; +D_F0000008 = 0xF0000008; +D_F1FFFFFF = 0xF1FFFFFF; +D_F5000007 = 0xF5000007; +D_F79DDD0F = 0xF79DDD0F; +D_FA000028 = 0xFA000028; +D_FD100008 = 0xFD100008; +jtbl_8009A578 = 0x8009A578; +jtbl_8009A590 = 0x8009A590; +jtbl_8026FF60 = 0x8026FF60; +D_8026FF80 = 0x8026FF80; +D_8026FF88 = 0x8026FF88; +D_8026FF90 = 0x8026FF90; +D_8026FF98 = 0x8026FF98; +D_8026FFA0 = 0x8026FFA0; +D_8026FFA8 = 0x8026FFA8; +D_8026FB30 = 0x8026FB30; +D_8026FC48 = 0x8026FC48; +D_8026FC10 = 0x8026FC10; +D_8026F348 = 0x8026F348; +D_8026FFB0 = 0x8026FFB0; +D_8026FBD8 = 0x8026FBD8; +D_8026FCF0 = 0x8026FCF0; +D_8026FCB8 = 0x8026FCB8; +D_80270040 = 0x80270040; +D_8026FD98 = 0x8026FD98; +D_80270048 = 0x80270048; +D_8026F5A0 = 0x8026F5A0; +D_8026A2B0 = 0x8026A2B0; +D_80270050 = 0x80270050; +D_80270058 = 0x80270058; +D_80270060 = 0x80270060; +D_80270068 = 0x80270068; +D_80270070 = 0x80270070; +D_8026FE78 = 0x8026FE78; +D_8026F118 = 0x8026F118; +D_802510B0 = 0x802510B0; +D_8026F1B8 = 0x8026F1B8; +D_8026F2A0 = 0x8026F2A0; +D_8026FEE8 = 0x8026FEE8; +D_80270080 = 0x80270080; +D_80270088 = 0x80270088; +D_80270090 = 0x80270090; +D_80270098 = 0x80270098; +D_802700A0 = 0x802700A0; +D_802700A8 = 0x802700A8; +D_802700B0 = 0x802700B0; +D_802700B8 = 0x802700B8; +D_8026F778 = 0x8026F778; +D_8026F8D4 = 0x8026F8D4; + +// BSS syms found in main overlay +#ifndef NON_MATCHING +nuScPreNMIFlag = 0x8009A5B0; +D_8009A5B8 = 0x8009A5B8; +D_8009A5C0 = 0x8009A5C0; +D_8009A5C8 = 0x8009A5C8; +D_8009A5CC = 0x8009A5CC; +D_8009A5D0 = 0x8009A5D0; +D_8009A5D4 = 0x8009A5D4; +timeFreezeMode = 0x8009A5D8; +nuGfxZBuffer = 0x8009A5DC; +nuContDataLockKey = 0x8009A5E0; +D_8009A5E4 = 0x8009A5E4; +D_8009A5E8 = 0x8009A5E8; +D_8009A5EC = 0x8009A5EC; +nuGfxCfbCounter = 0x8009A5F0; +D_8009A5F4 = 0x8009A5F4; +nuGfxDisplay = 0x8009A5F8; +D_8009A5FC = 0x8009A5FC; +gGameState = 0x8009A600; +gNpcCount = 0x8009A604; +D_8009A606 = 0x8009A606; +D_8009A608 = 0x8009A608; +D_8009A60C = 0x8009A60C; +nuGfxUcode = 0x8009A610; +nuContNum = 0x8009A614; +nuGfxTaskSpool = 0x8009A618; +D_8009A61C = 0x8009A61C; +D_8009A620 = 0x8009A620; +D_8009A628 = 0x8009A628; +D_8009A62C = 0x8009A62C; +D_8009A630 = 0x8009A630; +gCurrentCamID = 0x8009A634; +nuPiCartHandle = 0x8009A638; +D_8009A63C = 0x8009A63C; +D_8009A640 = 0x8009A640; +nuGfxCfb_ptr = 0x8009A64C; +gOverrideFlags = 0x8009A650; +D_8009A654 = 0x8009A654; +nuGfxCfb = 0x8009A658; +D_8009A660 = 0x8009A660; +D_8009A664 = 0x8009A664; +D_8009A668 = 0x8009A668; +gMasterGfxPos = 0x8009A66C; +D_8009A670 = 0x8009A670; +gDisplayContext = 0x8009A674; +D_8009A678 = 0x8009A678; +D_8009A680 = 0x8009A680; +D_8009A690 = 0x8009A690; +D_8009A6A0 = 0x8009A6A0; +D_8009A6A2 = 0x8009A6A2; +D_8009A6A4 = 0x8009A6A4; +D_8009A6A6 = 0x8009A6A6; +D_8009A6B0 = 0x8009A6B0; +logicalSaveInfo = 0x8009BA30; +physicalSaveInfo = 0x8009BA50; +nextAvailableSavePage = 0x8009BA80; +gCurtainScale = 0x8009BA90; +gCurtainScaleGoal = 0x8009BA94; +gCurtainFade = 0x8009BA98; +gCurtainFadeGoal = 0x8009BA9C; +gCurtainDrawCallback = 0x8009BAA0; +D_8009BAA8 = 0x8009BAA8; +D_8009BB30 = 0x8009BB30; +D_8009C4E0 = 0x8009C4E0; +D_8009C4FC = 0x8009C4FC; +nuGfxTask_ptr = 0x8009C510; +taskDoneMsg = 0x8009C514; +swapBufMsg = 0x8009C516; +GfxTaskMgrThread = 0x8009C518; +D_8009E6D0 = 0x8009E6D0; +nuSiMesgBuf = 0x8009E6F0; +siMgrThread = 0x8009E710; +D_800A08C0 = 0x800A08C0; +D_800A08DC = 0x800A08DC; +D_800A08E0 = 0x800A08E0; +D_800A08E4 = 0x800A08E4; +D_800A08E8 = 0x800A08E8; +D_800A08EC = 0x800A08EC; +gameMode = 0x800A08F0; +D_800A0900 = 0x800A0900; +D_800A0904 = 0x800A0904; +D_800A0908 = 0x800A0908; +D_800A0910 = 0x800A0910; +D_800A0914 = 0x800A0914; +D_800A0918 = 0x800A0918; +D_800A091C = 0x800A091C; +D_800A0920 = 0x800A0920; +D_800A0921 = 0x800A0921; +D_800A0922 = 0x800A0922; +D_800A0924 = 0x800A0924; +D_800A0930 = 0x800A0930; +D_800A0931 = 0x800A0931; +D_800A0932 = 0x800A0932; +gMapTransitionAlpha = 0x800A0940; +D_800A0942 = 0x800A0942; +D_800A0944 = 0x800A0944; +D_800A0946 = 0x800A0946; +D_800A0948 = 0x800A0948; +D_800A0950 = 0x800A0950; +D_800A0954 = 0x800A0954; +D_800A0956 = 0x800A0956; +D_800A0958 = 0x800A0958; +D_800A095A = 0x800A095A; +D_800A095B = 0x800A095B; +D_800A095C = 0x800A095C; +D_800A095D = 0x800A095D; +D_800A095E = 0x800A095E; +D_800A095F = 0x800A095F; +D_800A0960 = 0x800A0960; +D_800A0963 = 0x800A0963; +D_800A0964 = 0x800A0964; +D_800A0970 = 0x800A0970; +D_800A0974 = 0x800A0974; +D_800A0978 = 0x800A0978; +D_800A097C = 0x800A097C; +D_800A0980 = 0x800A0980; +D_800A0988 = 0x800A0988; +gWorldNpcList = 0x800A0990; +gBattleNpcList = 0x800A0A90; +gCurrentNpcListPtr = 0x800A0B90; +D_800A0B94 = 0x800A0B94; +D_800A0BA0 = 0x800A0BA0; +D_800A0BA4 = 0x800A0BA4; +D_800A0BA8 = 0x800A0BA8; +D_800A0BAC = 0x800A0BAC; +D_800A0BB0 = 0x800A0BB0; +D_800A0BB4 = 0x800A0BB4; +D_800A0BB8 = 0x800A0BB8; +D_800A0BC0 = 0x800A0BC0; +D_800A0F40 = 0x800A0F40; +D_800A0F44 = 0x800A0F44; +D_800A0F50 = 0x800A0F50; +D_800A0F58 = 0x800A0F58; +D_800A1530 = 0x800A1530; +D_800A158C = 0x800A158C; +D_800A15A4 = 0x800A15A4; +D_800A15A8 = 0x800A15A8; +D_800A15C4 = 0x800A15C4; +D_800A15CC = 0x800A15CC; +D_800A3510 = 0x800A3510; +D_800A3520 = 0x800A3520; +D_800A3628 = 0x800A3628; +nuAuFrameSampleSize = 0x800A3634; +D_800A3638 = 0x800A3638; +D_800A3640 = 0x800A3640; +D_800A3658 = 0x800A3658; +D_800A3720 = 0x800A3720; +nuAuDmaState = 0x800A3BD0; +D_800A3BD4 = 0x800A3BD4; +nuAuDmaBuf = 0x800A3BE0; +D_800A3BF0 = 0x800A3BF0; +D_800A3FD0 = 0x800A3FD0; +D_800A3FE0 = 0x800A3FE0; +D_800A3FE4 = 0x800A3FE4; +D_800A3FE8 = 0x800A3FE8; +D_800A3FEC = 0x800A3FEC; +D_800A3FEE = 0x800A3FEE; +D_800A3FF0 = 0x800A3FF0; +gEffectGraphicsData = 0x800A4000; +D_800A41C0 = 0x800A41C0; +gMap = 0x800A41E0; +gMapConfig = 0x800A41E8; +D_800A4230 = 0x800A4230; +D_800A4234 = 0x800A4234; +D_800A4238 = 0x800A4238; +D_800A423C = 0x800A423C; +D_800A4240 = 0x800A4240; +D_800A4244 = 0x800A4244; +D_800A4248 = 0x800A4248; +D_800A424C = 0x800A424C; +D_800A4250 = 0x800A4250; +D_800A4254 = 0x800A4254; +D_800A4258 = 0x800A4258; +D_800A425C = 0x800A425C; +D_800A4260 = 0x800A4260; +D_800A4264 = 0x800A4264; +D_800A4268 = 0x800A4268; +D_800A4270 = 0x800A4270; +D_800A4420 = 0x800A4420; +nuScStack = 0x800A65D0; +nuScAudioStack = 0x800A85D0; +nuScGraphicsStack = 0x800AA5D0; +D_800AC5D0 = 0x800AC5D0; +D_800AC5E8 = 0x800AC5E8; +nuGfxMesgBuf = 0x800AC6B0; +nuContWaitMesgBuf = 0x800AE6D0; +nuContDataMutexBuf = 0x800AE6D4; +piMgrThread = 0x800AE6E0; +__osPiMesgQueue = 0x800AF890; +piMgrMesgBuff = 0x800AF8A8; +D_800AF8B0 = 0x800AF8B0; +D_800AF8C0 = 0x800AF8C0; +D_800AF8C4 = 0x800AF8C4; +D_800AF8D0 = 0x800AF8D0; +D_800AF8D8 = 0x800AF8D8; +D_800AF8DC = 0x800AF8DC; +D_800AF8E0 = 0x800AF8E0; +D_800AF8E8 = 0x800AF8E8; +D_800AF8EC = 0x800AF8EC; +D_800AF8F0 = 0x800AF8F0; +D_800AF8F8 = 0x800AF8F8; +D_800AF8FC = 0x800AF8FC; +D_800AF900 = 0x800AF900; +D_800AF910 = 0x800AF910; +D_800AF918 = 0x800AF918; +D_800B0AD0 = 0x800B0AD0; +D_800B0AE8 = 0x800B0AE8; +D_800B0B00 = 0x800B0B00; +D_800B0B02 = 0x800B0B02; +D_800B0B04 = 0x800B0B04; +D_800B0B18 = 0x800B0B18; +D_800B0B1A = 0x800B0B1A; +D_800B0B1C = 0x800B0B1C; +D_800B0B30 = 0x800B0B30; +D_800B0B6C = 0x800B0B6C; +D_800B0C30 = 0x800B0C30; +D_800B0C40 = 0x800B0C40; +D_800B0C42 = 0x800B0C42; +D_800B0C44 = 0x800B0C44; +D_800B0C48 = 0x800B0C48; +D_800B0C4C = 0x800B0C4C; +D_800B0C50 = 0x800B0C50; +D_800B0C58 = 0x800B0C58; +D_800B0C70 = 0x800B0C70; +D_800B0C74 = 0x800B0C74; +D_800B0C75 = 0x800B0C75; +D_800B0C76 = 0x800B0C76; +D_800B0C77 = 0x800B0C77; +D_800B0C78 = 0x800B0C78; +D_800B0C79 = 0x800B0C79; +D_800B0C7C = 0x800B0C7C; +D_800B0C80 = 0x800B0C80; +D_800B0CE4 = 0x800B0CE4; +D_800B0CE8 = 0x800B0CE8; +wMapTexName = 0x800B0CF0; +D_800B0D08 = 0x800B0D08; +nuContWaitMesgQ = 0x800B0EB8; +D_800B0ED0 = 0x800B0ED0; +D_800B0F08 = 0x800B0F08; +D_800B0F0C = 0x800B0F0C; +gCurrentEncounter = 0x800B0F10; +LeoDiskHandle = 0x800B1B08; +D_800B1B0C = 0x800B1B0C; +D_800B1B0D = 0x800B1B0D; +D_800B1B0E = 0x800B1B0E; +D_800B1B0F = 0x800B1B0F; +D_800B1B10 = 0x800B1B10; +nuContStatus = 0x800B1B7C; +D_800B1B90 = 0x800B1B90; +nuContRmbCtl = 0x800B1D40; +nuContData = 0x800B1D68; +gCameras = 0x800B1D80; +gCollisionData = 0x800B42E0; +nuGfxMesgQ = 0x800B42F0; +D_800B4308 = 0x800B4308; +D_800B430C = 0x800B430C; +D_800B430D = 0x800B430D; +D_800B430E = 0x800B430E; +D_800B430F = 0x800B430F; +D_800B4310 = 0x800B4310; +D_800B4311 = 0x800B4311; +D_800B4314 = 0x800B4314; +D_800B4318 = 0x800B4318; +gOsPiMessageQueue = 0x800B4380; +gEffectInstances = 0x800B4398; +D_800B4514 = 0x800B4514; +CartRomHandle = 0x800B4518; +D_800B451C = 0x800B451C; +D_800B451D = 0x800B451D; +D_800B451E = 0x800B451E; +D_800B451F = 0x800B451F; +D_800B4520 = 0x800B4520; +D_800B6590 = 0x800B6590; +D_800B7EF0 = 0x800B7EF0; +nuYieldBuf = 0x800B8590; +dead_gCameras = 0x800B8D80; +D_800B8DEC = 0x800B8DEC; +D_800B91A0 = 0x800B91A0; +D_800B91D0 = 0x800B91D0; +D_800D91D0 = 0x800D91D0; +D_800D91D4 = 0x800D91D4; +D_800D91DC = 0x800D91DC; +wMapHitName = 0x800D91E0; +nuSiMgrMesgQ = 0x800D91F8; +wMapShapeName = 0x800D9230; +D_800D9248 = 0x800D9248; +nuGfxTask = 0x800D9278; +D_800D95E8 = 0x800D95E8; +D_800D9620 = 0x800D9620; +D_800D9668 = 0x800D9668; +D_800D9680 = 0x800D9680; +D_800D9780 = 0x800D9780; +D_800D9F80 = 0x800D9F80; +D_800DA000 = 0x800DA000; +D_800DA03C = 0x800DA03C; +D_800DA040 = 0x800DA040; +nusched = 0x800DA440; +D_800DA444 = 0x800DA444; +D_800DA47C = 0x800DA47C; +D_800DA4B4 = 0x800DA4B4; +D_800DA55C = 0x800DA55C; +D_800DAAA8 = 0x800DAAA8; +D_800DAAAC = 0x800DAAAC; +D_800DAAB8 = 0x800DAAB8; +D_800DAABC = 0x800DAABC; +D_800DAABD = 0x800DAABD; +D_800DAAC0 = 0x800DAAC0; +nuContPfs = 0x800DAAD8; +nuSiMesgQ = 0x800DAC78; +D_800DAC90 = 0x800DAC90; +D_800DACA8 = 0x800DACA8; +gCurrentSaveFile = 0x800DACC0; +D_800DBC70 = 0x800DBC70; +D_800DBD70 = 0x800DBD70; +D_800DBF70 = 0x800DBF70; +D_800DBF90 = 0x800DBF90; +nuContDataMutexQ = 0x800DC040; +D_800DC060 = 0x800DC060; +D_800DC064 = 0x800DC064; +gBattleState = 0x800DC068; +gBattleStatus = 0x800DC070; +D_800DC4D0 = 0x800DC4D0; +D_800DC4D4 = 0x800DC4D4; +D_800DC4D8 = 0x800DC4D8; +gBattleState2 = 0x800DC4DC; +D_800DC4E0 = 0x800DC4E0; +D_800DC4E4 = 0x800DC4E4; +D_800DC4E8 = 0x800DC4E8; +gCurrentBattleSection = 0x800DC4EA; +D_800DC4EB = 0x800DC4EB; +D_800DC4EC = 0x800DC4EC; +D_800DC4F0 = 0x800DC4F0; +D_800DC4F4 = 0x800DC4F4; +D_800DC4F8 = 0x800DC4F8; +D_800DC4FC = 0x800DC4FC; +D_8010C920 = 0x8010C920; +D_8010C924 = 0x8010C924; +D_8010C928 = 0x8010C928; +D_8010C92C = 0x8010C92C; +wPartnerNpc = 0x8010C930; +D_8010C934 = 0x8010C934; +D_8010C938 = 0x8010C938; +D_8010C93C = 0x8010C93C; +D_8010C940 = 0x8010C940; +gSpinHistoryBufferPos = 0x8010C944; +D_8010C94C = 0x8010C94C; +D_8010C950 = 0x8010C950; +D_8010C954 = 0x8010C954; +D_8010C958 = 0x8010C958; +D_8010C95C = 0x8010C95C; +D_8010C960 = 0x8010C960; +D_8010C964 = 0x8010C964; +D_8010C968 = 0x8010C968; +D_8010C96B = 0x8010C96B; +D_8010C96C = 0x8010C96C; +D_8010C970 = 0x8010C970; +D_8010C974 = 0x8010C974; +D_8010C978 = 0x8010C978; +D_8010C97A = 0x8010C97A; +D_8010C97C = 0x8010C97C; +D_8010C980 = 0x8010C980; +D_8010C984 = 0x8010C984; +D_8010C98C = 0x8010C98C; +D_8010C990 = 0x8010C990; +D_8010C9A0 = 0x8010C9A0; +D_8010C9B0 = 0x8010C9B0; +D_8010C9C0 = 0x8010C9C0; +D_8010C9C8 = 0x8010C9C8; +D_8010CCF8 = 0x8010CCF8; +D_8010CCFA = 0x8010CCFA; +D_8010CCFC = 0x8010CCFC; +D_8010CCFE = 0x8010CCFE; +D_8010CD00 = 0x8010CD00; +D_8010CD10 = 0x8010CD10; +D_8010CD12 = 0x8010CD12; +D_8010CD20 = 0x8010CD20; +D_8010CD30 = 0x8010CD30; +D_8010CD34 = 0x8010CD34; +D_8010CD38 = 0x8010CD38; +D_8010CFB8 = 0x8010CFB8; +D_8010CFBC = 0x8010CFBC; +D_8010CFC0 = 0x8010CFC0; +D_8010CFC4 = 0x8010CFC4; +D_8010CFC8 = 0x8010CFC8; +D_8010CFCA = 0x8010CFCA; +D_8010CFCC = 0x8010CFCC; +D_8010CFCE = 0x8010CFCE; +D_8010CFD0 = 0x8010CFD0; +D_8010CFD4 = 0x8010CFD4; +D_8010CFD8 = 0x8010CFD8; +D_8010CFDC = 0x8010CFDC; +D_8010CFE0 = 0x8010CFE0; +D_8010CFE4 = 0x8010CFE4; +D_8010CFE8 = 0x8010CFE8; +wPartner = 0x8010CFEC; +D_8010CFF0 = 0x8010CFF0; +D_8010CFF4 = 0x8010CFF4; +D_8010D000 = 0x8010D000; +D_8010D640 = 0x8010D640; +D_8010D644 = 0x8010D644; +D_8010D648 = 0x8010D648; +D_8010D64C = 0x8010D64C; +D_8010D650 = 0x8010D650; +D_8010D654 = 0x8010D654; +D_8010D655 = 0x8010D655; +D_8010D656 = 0x8010D656; +D_8010D658 = 0x8010D658; +D_8010D65A = 0x8010D65A; +D_8010D65C = 0x8010D65C; +D_8010D660 = 0x8010D660; +D_8010D664 = 0x8010D664; +D_8010D668 = 0x8010D668; +D_8010D66C = 0x8010D66C; +D_8010D670 = 0x8010D670; +D_8010D674 = 0x8010D674; +D_8010D678 = 0x8010D678; +D_8010D67C = 0x8010D67C; +D_8010D67E = 0x8010D67E; +D_8010D680 = 0x8010D680; +D_8010D682 = 0x8010D682; +D_8010D684 = 0x8010D684; +D_8010D686 = 0x8010D686; +D_8010D688 = 0x8010D688; +D_8010D68A = 0x8010D68A; +D_8010D68C = 0x8010D68C; +D_8010D68E = 0x8010D68E; +D_8010D68F = 0x8010D68F; +D_8010D690 = 0x8010D690; +D_8010D691 = 0x8010D691; +D_8010D692 = 0x8010D692; +D_8010D693 = 0x8010D693; +D_8010D694 = 0x8010D694; +D_8010D698 = 0x8010D698; +D_8010D699 = 0x8010D699; +D_8010D69A = 0x8010D69A; +D_8010D69C = 0x8010D69C; +D_8010D6A0 = 0x8010D6A0; +D_8010D6A4 = 0x8010D6A4; +D_8010D6B0 = 0x8010D6B0; +gPartnerActionStatus = 0x8010EBB0; +gSpinHistoryPosY = 0x8010EF10; +gSpinHistoryPosX = 0x8010EF28; +gSpinHistoryPosZ = 0x8010EF40; +gUIStatus = 0x8010EF58; +D_8010EF92 = 0x8010EF92; +D_8010EF9C = 0x8010EF9C; +D_8010EF9D = 0x8010EF9D; +D_8010EF9E = 0x8010EF9E; +gPlayerStatus = 0x8010EFC8; +gPlayerActionState = 0x8010F07C; +gPlayerAnimation = 0x8010F080; +D_8010F250 = 0x8010F250; +gPlayerData = 0x8010F290; +gSpinHistoryPosAngle = 0x8010F6B8; +#endif + +// Invalid pointers from dead code +dead_atan2 = 0x8002AF70; +D_80100060 = 0x80100060; +D_801000A0 = 0x801000A0; +dead_get_variable = 0x802D4E8C; +dead_set_variable = 0x802D5468; +dead_get_float_variable = 0x802D57FC; +dead_cos_rad = 0x8002B4C0; +dead_set_float_variable = 0x802D5A10; +dead_playFX_11 = 0x80075170; +dead_gPlayerStatusPtr = 0x800FFC90; +dead_set_main_pan_u = 0x80126064; +dead_set_main_pan_v = 0x8012607C; +dead_set_aux_pan_u = 0x80126094; +dead_set_aux_pan_v = 0x801260AC; +dead_get_npc_unsafe = 0x8003E4BC; +func_80075110 = 0x80075110; +func_80042AF4 = 0x80042AF4; +func_8002B1C4 = 0x8002B1C4; +func_8002AF18 = 0x8002AF18; +dead_clamp_angle = 0x8002AE14; +func_8004D800 = 0x8004D800; +func_8002B28C = 0x8002B28C; +func_8004D9C0 = 0x8004D9C0; +func_8004DAD8 = 0x8004DAD8; +func_8004DF64 = 0x8004DF64; +func_8004E024 = 0x8004E024; +func_8004E25C = 0x8004E25C; +func_8004E2EC = 0x8004E2EC; +func_8004E39C = 0x8004E39C; +func_8004E544 = 0x8004E544; +func_8004E808 = 0x8004E808; +func_8004EB8C = 0x8004EB8C; +func_8004D1A4 = 0x8004D1A4; +func_8003E424 = 0x8003E424; +func_80067040 = 0x80067040; +func_800E5304 = 0x800E5304; +func_800E423C = 0x800E423C; +func_8004D0C4 = 0x8004D0C4; +func_8004D8E0 = 0x8004D8E0; +dead_rand_int = 0x8002ACEC; +func_8003E534 = 0x8003E534; +func_8002BFD4 = 0x8002BFD4; +func_8002C01C = 0x8002C01C; +func_8002B5DC = 0x8002B5DC; +func_8002B640 = 0x8002B640; +func_800F1EF8 = 0x800F1EF8; +func_8015704C = 0x8015704C; +func_80077C30 = 0x80077C30; +func_8002B6A4 = 0x8002B6A4; +func_80077930 = 0x80077930; +func_8011AAB4 = 0x8011AAB4; +func_8002B21C = 0x8002B21C; +func_802E2A80 = 0x802E2A80; +func_802E2B74 = 0x802E2B74; +func_80128510 = 0x80128510; +func_8012DFE8 = 0x8012DFE8; +func_8002AA2C = 0x8002AA2C; +func_80059AC8 = 0x80059AC8; +func_80118BB0 = 0x80118BB0; +func_80077BD0 = 0x80077BD0; +func_80041080 = 0x80041080; +func_800F1D9C = 0x800F1D9C; +func_800F1730 = 0x800F1730; +func_8003C43C = 0x8003C43C; +func_800F1718 = 0x800F1718; +func_800F16F4 = 0x800F16F4; +func_80125270 = 0x80125270; +func_80124F44 = 0x80124F44; +func_8006CAC0 = 0x8006CAC0; +func_800775D0 = 0x800775D0; +func_802F3B00 = 0x802F3B00; +func_800FCD0C = 0x800FCD0C; +func_800F9260 = 0x800F9260; +func_800F93E8 = 0x800F93E8; +func_800F2D5C = 0x800F2D5C; +func_80130C74 = 0x80130C74; +func_800769D0 = 0x800769D0; +func_80075E30 = 0x80075E30; +func_8002B524 = 0x8002B524; +func_8002BF18 = 0x8002BF18; +func_80076970 = 0x80076970; +func_80144200 = 0x80144200; +func_80144178 = 0x80144178; +func_800E53AC = 0x800E53AC; +func_8013CF98 = 0x8013CF98; +func_80066FE0 = 0x80066FE0; +func_8002A910 = 0x8002A910; +func_8005F128 = 0x8005F128; +func_800F7278 = 0x800F7278; +func_800F2E98 = 0x800F2E98; +func_8003ED50 = 0x8003ED50; +func_8003E5E8 = 0x8003E5E8; +func_8002FCBC = 0x8002FCBC; +func_801574DC = 0x801574DC; +func_80157118 = 0x80157118; +func_8005F238 = 0x8005F238; +func_80074070 = 0x80074070; +func_8002BF68 = 0x8002BF68; +func_80130C64 = 0x80130C64; +func_8002B45C = 0x8002B45C; +func_801266F8 = 0x801266F8; +func_80126734 = 0x80126734; +func_80144194 = 0x80144194; +dead_gItemTable = 0x8008D2C0; diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt index 0aa9c7d41d..e69de29bb2 100644 --- a/ver/us/undefined_syms_auto.txt +++ b/ver/us/undefined_syms_auto.txt @@ -1,1284 +0,0 @@ -D_80000000 = 0x80000000; -osTvType = 0x80000300; -D_80000308 = 0x80000308; -D_8000030C = 0x8000030C; -D_80000318 = 0x80000318; -D_8000031C = 0x8000031C; -D_80026AC7 = 0x80026AC7; -D_8004AA85 = 0x8004AA85; -D_80117160 = 0x80117160; -D_80117163 = 0x80117163; -D_80117578 = 0x80117578; -D_80117604 = 0x80117604; -D_8011762C = 0x8011762C; -D_80117840 = 0x80117840; -D_80117848 = 0x80117848; -D_80117852 = 0x80117852; -D_801512B0 = 0x801512B0; -D_801512B4 = 0x801512B4; -gCurrentCustomModelGfxBuilders = 0x801512B8; -D_801512BC = 0x801512BC; -D_801512C0 = 0x801512C0; -D_801512C4 = 0x801512C4; -D_801512C8 = 0x801512C8; -gCurrentModelListPtr = 0x801512CC; -D_801512D0 = 0x801512D0; -D_801512D4 = 0x801512D4; -gMsgBGScrollAmtX = 0x801512D8; -D_801512DA = 0x801512DA; -gCurrentTransformGroups = 0x801512E0; -gMsgGlobalWaveCounter = 0x801512E4; -gCurrentModelSpecialDlsPtr = 0x801512E8; -gLastCreatedEntityIndex = 0x801512EC; -D_801512F0 = 0x801512F0; -gMsgVarImages = 0x801512F4; -D_801512F8 = 0x801512F8; -D_801512FC = 0x801512FC; -D_80151300 = 0x80151300; -D_80151304 = 0x80151304; -D_80151308 = 0x80151308; -gMsgBGScrollAmtY = 0x8015130C; -D_8015130E = 0x8015130E; -D_80151310 = 0x80151310; -D_80151314 = 0x80151314; -gEntityModelCount = 0x80151318; -D_8015131C = 0x8015131C; -D_80151324 = 0x80151324; -D_80151328 = 0x80151328; -D_8015132C = 0x8015132C; -D_80151330 = 0x80151330; -gTriggerCount = 0x80151334; -D_80151338 = 0x80151338; -D_8015133C = 0x8015133C; -gCurrentDoorSoundsSet = 0x80151340; -D_80151344 = 0x80151344; -gWorldEntityList = 0x80151380; -gBattleEntityList = 0x801513F8; -gCurrentEntityListPtr = 0x80151470; -gWorldShadowList = 0x80151478; -gBattleShadowList = 0x80151568; -gCurrentShadowListPtr = 0x80151658; -D_8015165C = 0x8015165C; -D_80151660 = 0x80151660; -D_80151668 = 0x80151668; -D_801516DC = 0x801516DC; -D_801516E8 = 0x801516E8; -D_801516F4 = 0x801516F4; -D_801516FC = 0x801516FC; -gMainGameState = 0x80151700; -D_80151740 = 0x80151740; -gWorldModelList = 0x80151770; -gBattleModelList = 0x80151B70; -D_80151F70 = 0x80151F70; -D_80151F80 = 0x80151F80; -gWorldModelSpecialDls = 0x80151F90; -gBattleModelSpecialDls = 0x80152010; -D_80152090 = 0x80152090; -D_80152110 = 0x80152110; -D_80152190 = 0x80152190; -D_801521D0 = 0x801521D0; -D_80152210 = 0x80152210; -D_80152214 = 0x80152214; -D_80152218 = 0x80152218; -D_80152220 = 0x80152220; -D_80152A20 = 0x80152A20; -D_80153220 = 0x80153220; -D_80153221 = 0x80153221; -D_80153224 = 0x80153224; -D_80153226 = 0x80153226; -D_80153228 = 0x80153228; -D_80153248 = 0x80153248; -wFog = 0x80153264; -texPannerMainU = 0x80153268; -texPannerMainV = 0x801532A8; -texPannerAuxU = 0x801532E8; -texPannerAuxV = 0x80153328; -D_80153368 = 0x80153368; -D_8015336C = 0x8015336C; -D_8015336E = 0x8015336E; -D_80153370 = 0x80153370; -D_80153374 = 0x80153374; -D_80153376 = 0x80153376; -D_80153380 = 0x80153380; -D_801533A0 = 0x801533A0; -D_801533A8 = 0x801533A8; -D_801533AC = 0x801533AC; -D_801533B0 = 0x801533B0; -D_801533C0 = 0x801533C0; -D_801536B8 = 0x801536B8; -D_801536C0 = 0x801536C0; -D_801539B8 = 0x801539B8; -D_801539C0 = 0x801539C0; -D_80153A00 = 0x80153A00; -gCurrentAnimMeshListPtr = 0x80153A40; -D_80153A44 = 0x80153A44; -D_80153A48 = 0x80153A48; -D_80153A4B = 0x80153A4B; -D_80153A4C = 0x80153A4C; -D_80153A4F = 0x80153A4F; -D_80153A50 = 0x80153A50; -D_80153A53 = 0x80153A53; -D_80153A54 = 0x80153A54; -D_80153A57 = 0x80153A57; -D_80153A58 = 0x80153A58; -D_80153A5C = 0x80153A5C; -D_80153A60 = 0x80153A60; -D_80153A68 = 0x80153A68; -D_80153AA8 = 0x80153AA8; -D_80153AE8 = 0x80153AE8; -D_80153B28 = 0x80153B28; -D_80153B68 = 0x80153B68; -gWorldEntityModelList = 0x80153B70; -gBattleEntityModelList = 0x80153F70; -gCurrentEntityModelList = 0x80154370; -D_80154374 = 0x80154374; -entity_fog_enabled = 0x80154378; -entity_fog_red = 0x8015437C; -D_8015437F = 0x8015437F; -entity_fog_green = 0x80154380; -D_80154383 = 0x80154383; -entity_fog_blue = 0x80154384; -D_80154387 = 0x80154387; -entity_fog_alpha = 0x80154388; -D_8015438B = 0x8015438B; -entity_fog_dist_min = 0x8015438C; -entity_fog_dist_max = 0x80154390; -gWorldDynamicEntityList = 0x801543A0; -gBattleDynamicEntityList = 0x801543E0; -gCurrentDynamicEntityListPtr = 0x80154420; -gMessageBuffers = 0x80154430; -gMessagePrinters = 0x80154C30; -gMessageStringVars = 0x80155C38; -D_80155C98 = 0x80155C98; -gMessageWindowProjMatrix = 0x80155CA0; -D_80155D20 = 0x80155D20; -gMessageDrawStatePtr = 0x80155D74; -D_80155D80 = 0x80155D80; -D_80155D84 = 0x80155D84; -D_80155D88 = 0x80155D88; -D_80155D8C = 0x80155D8C; -D_80155D8E = 0x80155D8E; -D_80155D90 = 0x80155D90; -D_80155DA0 = 0x80155DA0; -D_801561A0 = 0x801561A0; -D_801565A0 = 0x801565A0; -D_801565A4 = 0x801565A4; -D_801565A6 = 0x801565A6; -D_801565A8 = 0x801565A8; -D_801565B0 = 0x801565B0; -D_801568E0 = 0x801568E0; -D_801568E4 = 0x801568E4; -D_801568E8 = 0x801568E8; -D_801568EC = 0x801568EC; -D_801568F0 = 0x801568F0; -D_801568F4 = 0x801568F4; -D_801568F8 = 0x801568F8; -D_80156900 = 0x80156900; -D_80156903 = 0x80156903; -D_80156904 = 0x80156904; -D_80156908 = 0x80156908; -D_8015690B = 0x8015690B; -D_8015690C = 0x8015690C; -D_80156948 = 0x80156948; -D_80156950 = 0x80156950; -D_80156954 = 0x80156954; -D_80156958 = 0x80156958; -D_80156960 = 0x80156960; -D_80156968 = 0x80156968; -D_80156970 = 0x80156970; -D_80156980 = 0x80156980; -D_80156F20 = 0x80156F20; -D_80156F60 = 0x80156F60; -D_80157460 = 0x80157460; -hudElements = 0x80157960; -D_80157964 = 0x80157964; -D_80157968 = 0x80157968; -D_80157970 = 0x80157970; -D_80157F70 = 0x80157F70; -D_80158570 = 0x80158570; -D_80158574 = 0x80158574; -D_80158580 = 0x80158580; -D_80158B80 = 0x80158B80; -D_80159180 = 0x80159180; -gTriggerList1 = 0x80159190; -gTriggerList2 = 0x80159290; -gCurrentTriggerListPtr = 0x80159390; -D_801593A0 = 0x801593A0; -D_8015959E = 0x8015959E; -D_801595A0 = 0x801595A0; -D_801595C0 = 0x801595C0; -D_80159670 = 0x80159670; -D_80159720 = 0x80159720; -D_801597D0 = 0x801597D0; -D_80159880 = 0x80159880; -D_801598A0 = 0x801598A0; -D_801599B8 = 0x801599B8; -D_80159AD0 = 0x80159AD0; -D_80159AD4 = 0x80159AD4; -gMusicUnkVolume = 0x80159AE0; -gMusicTargetVolume = 0x80159AE2; -gMusicUnkVolume2 = 0x80159AE4; -gMusicCurrentVolume = 0x80159AE6; -gMusicSettings = 0x80159AF0; -D_80159B08 = 0x80159B08; -D_80159B50 = 0x80159B50; -gUIPanels = 0x80159D50; -D_80159D54 = 0x80159D54; -D_80159E7E = 0x80159E7E; -D_8015A010 = 0x8015A010; -D_8015A070 = 0x8015A070; -D_8015A07C = 0x8015A07C; -D_8015A1E2 = 0x8015A1E2; -D_8015A2BC = 0x8015A2BC; -D_8015A2BE = 0x8015A2BE; -D_8015A2D0 = 0x8015A2D0; -D_8015A370 = 0x8015A370; -gCollisionStatus = 0x8015A550; -D_8015A578 = 0x8015A578; -D_8015A57A = 0x8015A57A; -D_8015A590 = 0x8015A590; -D_8015C74C = 0x8015C74C; -D_8015C790 = 0x8015C790; -D_8015C7A4 = 0x8015C7A4; -D_8015C7A8 = 0x8015C7A8; -D_8015C7C0 = 0x8015C7C0; -D_8015C7D0 = 0x8015C7D0; -D_8015C7D2 = 0x8015C7D2; -D_8015C7D8 = 0x8015C7D8; -D_8015C7E0 = 0x8015C7E0; -D_80164000 = 0x80164000; -D_80169B12 = 0x80169B12; -D_80169B16 = 0x80169B16; -D_80197000 = 0x80197000; -D_801A6000 = 0x801A6000; -D_801A7000 = 0x801A7000; -D_801AA000 = 0x801AA000; -D_80210000 = 0x80210000; -D_80219040 = 0x80219040; -D_80220740 = 0x80220740; -D_80220744 = 0x80220744; -D_80220750 = 0x80220750; -D_80220754 = 0x80220754; -D_80220760 = 0x80220760; -D_80220770 = 0x80220770; -D_80220780 = 0x80220780; -D_80224D60 = 0x80224D60; -D_80224D64 = 0x80224D64; -D_80224D70 = 0x80224D70; -D_80224D74 = 0x80224D74; -D_80224D80 = 0x80224D80; -D_80224D90 = 0x80224D90; -D_80224DA0 = 0x80224DA0; -D_80224DB0 = 0x80224DB0; -D_8022ADD0 = 0x8022ADD0; -D_8022B550 = 0x8022B550; -D_802310D0 = 0x802310D0; -D_80232C20 = 0x80232C20; -D_80232C4C = 0x80232C4C; -D_80232C50 = 0x80232C50; -D_80235E00 = 0x80235E00; -D_802367F0 = 0x802367F0; -D_8023BD70 = 0x8023BD70; -D_8023BD78 = 0x8023BD78; -D_8023BD98 = 0x8023BD98; -D_8023BDB4 = 0x8023BDB4; -D_8023BDB8 = 0x8023BDB8; -D_8023BDBC = 0x8023BDBC; -D_8023BDC0 = 0x8023BDC0; -D_8023BDC4 = 0x8023BDC4; -D_8023BDC8 = 0x8023BDC8; -D_8023C070 = 0x8023C070; -D_8023C1B0 = 0x8023C1B0; -D_8023C1B4 = 0x8023C1B4; -D_8023C1B8 = 0x8023C1B8; -D_8023C1BC = 0x8023C1BC; -D_8023C1C0 = 0x8023C1C0; -D_8023C1C4 = 0x8023C1C4; -D_8023C1C8 = 0x8023C1C8; -D_8023C1CC = 0x8023C1CC; -D_8023C1D0 = 0x8023C1D0; -D_8023CDA0 = 0x8023CDA0; -D_8023CDA4 = 0x8023CDA4; -D_8023D1E0 = 0x8023D1E0; -D_8023D1E4 = 0x8023D1E4; -D_8023D26C = 0x8023D26C; -D_8023D270 = 0x8023D270; -D_8023D274 = 0x8023D274; -D_8023D278 = 0x8023D278; -D_8023D27C = 0x8023D27C; -D_8023D280 = 0x8023D280; -D_8023D284 = 0x8023D284; -D_8023D288 = 0x8023D288; -D_8023D28C = 0x8023D28C; -D_8023D290 = 0x8023D290; -D_8023D294 = 0x8023D294; -D_8023D298 = 0x8023D298; -D_8023D29C = 0x8023D29C; -D_8023D2A0 = 0x8023D2A0; -D_8023D2A4 = 0x8023D2A4; -D_8023D2A8 = 0x8023D2A8; -D_8023D2AC = 0x8023D2AC; -D_8023D2B0 = 0x8023D2B0; -D_8023D2B4 = 0x8023D2B4; -D_8023D2B8 = 0x8023D2B8; -D_8023D2BC = 0x8023D2BC; -D_8023D2C0 = 0x8023D2C0; -D_8023D2C4 = 0x8023D2C4; -D_8023D2C8 = 0x8023D2C8; -D_8023D2D0 = 0x8023D2D0; -D_8023D330 = 0x8023D330; -D_8023D334 = 0x8023D334; -D_8023D338 = 0x8023D338; -D_80241ECC = 0x80241ECC; -D_80242208 = 0x80242208; -D_80242344 = 0x80242344; -D_802429BC = 0x802429BC; -D_802429E0 = 0x802429E0; -D_80242FB0 = 0x80242FB0; -D_80243190 = 0x80243190; -D_80243374 = 0x80243374; -D_80243720 = 0x80243720; -D_80243BE0 = 0x80243BE0; -D_802440E0 = 0x802440E0; -D_802440E1 = 0x802440E1; -D_802440E2 = 0x802440E2; -D_802440E3 = 0x802440E3; -D_802440E5 = 0x802440E5; -D_802440EB = 0x802440EB; -D_802440EF = 0x802440EF; -D_802440F3 = 0x802440F3; -D_802440F7 = 0x802440F7; -D_802440F8 = 0x802440F8; -D_802440FB = 0x802440FB; -D_802440FF = 0x802440FF; -D_80244104 = 0x80244104; -D_802442D0 = 0x802442D0; -D_80244494 = 0x80244494; -D_802447C0 = 0x802447C0; -D_80244A20 = 0x80244A20; -D_80244C18 = 0x80244C18; -D_80244D88 = 0x80244D88; -D_802451F0 = 0x802451F0; -D_80245230 = 0x80245230; -D_80245278 = 0x80245278; -D_802453D8 = 0x802453D8; -D_80245430 = 0x80245430; -D_80245601 = 0x80245601; -D_80245602 = 0x80245602; -D_80245603 = 0x80245603; -D_80245604 = 0x80245604; -D_80245605 = 0x80245605; -D_80245608 = 0x80245608; -D_8024560B = 0x8024560B; -D_8024560C = 0x8024560C; -D_8024560F = 0x8024560F; -D_80245610 = 0x80245610; -D_80245613 = 0x80245613; -D_80245614 = 0x80245614; -D_80245617 = 0x80245617; -D_80245618 = 0x80245618; -D_8024561B = 0x8024561B; -D_8024561C = 0x8024561C; -D_8024561F = 0x8024561F; -D_80245620 = 0x80245620; -D_80245650 = 0x80245650; -D_80245928 = 0x80245928; -D_8024592C = 0x8024592C; -D_802459C0 = 0x802459C0; -D_80245AB4 = 0x80245AB4; -D_802461F0 = 0x802461F0; -D_80246260 = 0x80246260; -D_802462F0 = 0x802462F0; -D_80246300 = 0x80246300; -D_80246424 = 0x80246424; -D_8024652C = 0x8024652C; -D_80246530 = 0x80246530; -D_80246534 = 0x80246534; -D_80246554 = 0x80246554; -D_8024655C = 0x8024655C; -D_80246578 = 0x80246578; -D_80246598 = 0x80246598; -D_8024659C = 0x8024659C; -D_802465A0 = 0x802465A0; -D_802465CC = 0x802465CC; -D_802465F0 = 0x802465F0; -D_802466D0 = 0x802466D0; -D_80246794 = 0x80246794; -D_802467B4 = 0x802467B4; -D_80246894 = 0x80246894; -D_80246990 = 0x80246990; -D_80246BE8 = 0x80246BE8; -D_80247050 = 0x80247050; -D_80247120 = 0x80247120; -D_802474A0 = 0x802474A0; -D_80247548 = 0x80247548; -D_80247664 = 0x80247664; -D_80247750 = 0x80247750; -D_802479F0 = 0x802479F0; -D_80247BF0 = 0x80247BF0; -D_80247CA0 = 0x80247CA0; -D_80247CB4 = 0x80247CB4; -D_80247D00 = 0x80247D00; -D_80247DF0 = 0x80247DF0; -D_80247E68 = 0x80247E68; -D_80248380 = 0x80248380; -D_80248388 = 0x80248388; -D_802483C0 = 0x802483C0; -D_802483C4 = 0x802483C4; -D_802483D0 = 0x802483D0; -D_80248480 = 0x80248480; -D_8024854C = 0x8024854C; -D_80248600 = 0x80248600; -D_80248624 = 0x80248624; -D_80248650 = 0x80248650; -D_80248850 = 0x80248850; -D_80248924 = 0x80248924; -D_80248938 = 0x80248938; -D_80248940 = 0x80248940; -D_80248944 = 0x80248944; -D_80248948 = 0x80248948; -D_80248F90 = 0x80248F90; -D_80249158 = 0x80249158; -D_80249440 = 0x80249440; -D_8024A290 = 0x8024A290; -D_8024A2A0 = 0x8024A2A0; -D_8024A2C4 = 0x8024A2C4; -D_8024A2D0 = 0x8024A2D0; -D_8024B990 = 0x8024B990; -D_8024B9B4 = 0x8024B9B4; -D_8024B9B8 = 0x8024B9B8; -D_8024BA90 = 0x8024BA90; -D_8024BB80 = 0x8024BB80; -D_8024BDD0 = 0x8024BDD0; -D_8024BDE8 = 0x8024BDE8; -D_8024BDF0 = 0x8024BDF0; -D_8024BDF4 = 0x8024BDF4; -D_8024BDF8 = 0x8024BDF8; -D_8024BEA0 = 0x8024BEA0; -D_8024C068 = 0x8024C068; -D_8024C080 = 0x8024C080; -D_8024C084 = 0x8024C084; -D_8024C088 = 0x8024C088; -D_8024C08C = 0x8024C08C; -D_8024C090 = 0x8024C090; -D_8024C094 = 0x8024C094; -D_8024C0B0 = 0x8024C0B0; -D_8024C108 = 0x8024C108; -D_8024C110 = 0x8024C110; -D_8024C117 = 0x8024C117; -D_8024C1D8 = 0x8024C1D8; -D_8024C5E0 = 0x8024C5E0; -D_8024DBC0 = 0x8024DBC0; -D_8024DD88 = 0x8024DD88; -D_8024DF10 = 0x8024DF10; -D_8024DF18 = 0x8024DF18; -D_8024DF1C = 0x8024DF1C; -D_8024DF20 = 0x8024DF20; -D_8024DF24 = 0x8024DF24; -D_8024DFC0 = 0x8024DFC0; -D_8024DFD8 = 0x8024DFD8; -D_8024DFE0 = 0x8024DFE0; -D_8024DFE4 = 0x8024DFE4; -D_8024DFE8 = 0x8024DFE8; -D_8024DFF0 = 0x8024DFF0; -D_8024E1B4 = 0x8024E1B4; -D_8024E540 = 0x8024E540; -D_8024E558 = 0x8024E558; -D_8024E560 = 0x8024E560; -D_8024E564 = 0x8024E564; -D_8024E568 = 0x8024E568; -D_8024E570 = 0x8024E570; -D_8024E738 = 0x8024E738; -D_8024E960 = 0x8024E960; -D_8024EA10 = 0x8024EA10; -D_8024EA14 = 0x8024EA14; -D_8024EA18 = 0x8024EA18; -gPauseMenuTabs = 0x8024EF80; -D_8024EF84 = 0x8024EF84; -D_8024EF88 = 0x8024EF88; -D_8024EF90 = 0x8024EF90; -gPauseMenuCursorPosY = 0x8024EFA0; -D_8024EFB8 = 0x8024EFB8; -D_8024EFC0 = 0x8024EFC0; -D_8024EFC8 = 0x8024EFC8; -D_8024F010 = 0x8024F010; -D_8024F080 = 0x8024F080; -D_8024F248 = 0x8024F248; -D_8024F2A0 = 0x8024F2A0; -D_8024F2A1 = 0x8024F2A1; -D_8024F2A2 = 0x8024F2A2; -D_8024F2A3 = 0x8024F2A3; -D_8024F2A4 = 0x8024F2A4; -D_8024F2A5 = 0x8024F2A5; -D_8024F2A8 = 0x8024F2A8; -D_8024F2AB = 0x8024F2AB; -D_8024F2AC = 0x8024F2AC; -D_8024F2AF = 0x8024F2AF; -D_8024F2B0 = 0x8024F2B0; -D_8024F2B3 = 0x8024F2B3; -D_8024F2B4 = 0x8024F2B4; -D_8024F2B7 = 0x8024F2B7; -D_8024F2B8 = 0x8024F2B8; -D_8024F2BB = 0x8024F2BB; -D_8024F2BC = 0x8024F2BC; -D_8024F2BF = 0x8024F2BF; -D_8024F2C4 = 0x8024F2C4; -D_8024F2C8 = 0x8024F2C8; -D_8024F2CC = 0x8024F2CC; -D_8024F2D8 = 0x8024F2D8; -D_8024F2DC = 0x8024F2DC; -D_8024F2E0 = 0x8024F2E0; -D_8024F2EC = 0x8024F2EC; -D_8024F2F4 = 0x8024F2F4; -D_8024F2F8 = 0x8024F2F8; -D_8024F2FC = 0x8024F2FC; -D_8024F304 = 0x8024F304; -D_8024F308 = 0x8024F308; -D_8024F30C = 0x8024F30C; -D_8024F318 = 0x8024F318; -D_8024F338 = 0x8024F338; -D_8024F358 = 0x8024F358; -D_8024F374 = 0x8024F374; -D_8024F378 = 0x8024F378; -D_8024F3F8 = 0x8024F3F8; -D_8024F448 = 0x8024F448; -D_8024F498 = 0x8024F498; -D_8024F4E8 = 0x8024F4E8; -D_8024F581 = 0x8024F581; -D_8024F582 = 0x8024F582; -D_8024F583 = 0x8024F583; -D_8024F584 = 0x8024F584; -D_8024F585 = 0x8024F585; -D_8024F588 = 0x8024F588; -D_8024F58B = 0x8024F58B; -D_8024F58C = 0x8024F58C; -D_8024F58F = 0x8024F58F; -D_8024F590 = 0x8024F590; -D_8024F593 = 0x8024F593; -D_8024F594 = 0x8024F594; -D_8024F597 = 0x8024F597; -D_8024F598 = 0x8024F598; -D_8024F59B = 0x8024F59B; -D_8024F59C = 0x8024F59C; -D_8024F59F = 0x8024F59F; -D_8024F5A0 = 0x8024F5A0; -D_8024F5A4 = 0x8024F5A4; -D_8024F5C4 = 0x8024F5C4; -D_8024F5C8 = 0x8024F5C8; -D_8024F5D0 = 0x8024F5D0; -D_8024F7E4 = 0x8024F7E4; -D_8024F7F0 = 0x8024F7F0; -D_8024FBA0 = 0x8024FBA0; -D_8024FD68 = 0x8024FD68; -D_8024FED8 = 0x8024FED8; -D_8024FEF0 = 0x8024FEF0; -D_8024FEF8 = 0x8024FEF8; -D_8024FEFC = 0x8024FEFC; -D_8024FF00 = 0x8024FF00; -D_8024FF04 = 0x8024FF04; -D_80250EF0 = 0x80250EF0; -D_802513D0 = 0x802513D0; -D_802513E8 = 0x802513E8; -D_802513F4 = 0x802513F4; -D_802513F8 = 0x802513F8; -D_80251400 = 0x80251400; -D_80251450 = 0x80251450; -D_80251468 = 0x80251468; -D_80251470 = 0x80251470; -D_80251478 = 0x80251478; -D_802515C4 = 0x802515C4; -D_80251C40 = 0x80251C40; -D_80251C58 = 0x80251C58; -D_80251C60 = 0x80251C60; -D_80251C68 = 0x80251C68; -D_80251C70 = 0x80251C70; -D_80251E34 = 0x80251E34; -D_802529D0 = 0x802529D0; -D_802529E8 = 0x802529E8; -D_802529F0 = 0x802529F0; -D_802529F4 = 0x802529F4; -D_80252A00 = 0x80252A00; -D_80252BC8 = 0x80252BC8; -D_80252D38 = 0x80252D38; -D_80253060 = 0x80253060; -D_80253378 = 0x80253378; -D_80253384 = 0x80253384; -D_8025338C = 0x8025338C; -D_80253390 = 0x80253390; -D_802547D0 = 0x802547D0; -D_802549B8 = 0x802549B8; -D_802549C4 = 0x802549C4; -D_802549C8 = 0x802549C8; -D_802549D0 = 0x802549D0; -D_80254B94 = 0x80254B94; -D_80254BA0 = 0x80254BA0; -D_80254D68 = 0x80254D68; -D_80255B70 = 0x80255B70; -D_80255B88 = 0x80255B88; -D_80255B90 = 0x80255B90; -D_80255B94 = 0x80255B94; -D_80255B98 = 0x80255B98; -D_80255BA0 = 0x80255BA0; -D_80255D68 = 0x80255D68; -D_80255ED8 = 0x80255ED8; -D_80255EE0 = 0x80255EE0; -D_802560A4 = 0x802560A4; -D_80257118 = 0x80257118; -D_80257320 = 0x80257320; -D_80257F20 = 0x80257F20; -D_80257F21 = 0x80257F21; -D_80257F22 = 0x80257F22; -D_80257F23 = 0x80257F23; -D_80257F24 = 0x80257F24; -D_80257F25 = 0x80257F25; -D_80257F26 = 0x80257F26; -D_80257F27 = 0x80257F27; -D_80257F28 = 0x80257F28; -D_80257F29 = 0x80257F29; -D_80257F2C = 0x80257F2C; -D_80257F40 = 0x80257F40; -D_80257F48 = 0x80257F48; -D_80257F4C = 0x80257F4C; -D_80257F50 = 0x80257F50; -D_80257F58 = 0x80257F58; -D_8025811C = 0x8025811C; -D_80258120 = 0x80258120; -D_80258140 = 0x80258140; -D_80258340 = 0x80258340; -D_8025B0A8 = 0x8025B0A8; -D_8025B2A8 = 0x8025B2A8; -D_8025B2AC = 0x8025B2AC; -D_8025B2B0 = 0x8025B2B0; -D_8025C0D0 = 0x8025C0D0; -D_80262A40 = 0x80262A40; -D_80262A58 = 0x80262A58; -D_80262A60 = 0x80262A60; -D_80262A64 = 0x80262A64; -D_80262A68 = 0x80262A68; -D_80262A70 = 0x80262A70; -D_80262C34 = 0x80262C34; -D_80262C38 = 0x80262C38; -D_80262F68 = 0x80262F68; -D_80268000 = 0x80268000; -gPauseMenuCommonIconIDs = 0x802700E8; -D_80270108 = 0x80270108; -D_8027010C = 0x8027010C; -D_80270110 = 0x80270110; -D_80270114 = 0x80270114; -D_80270118 = 0x80270118; -D_8027011C = 0x8027011C; -gPauseMenuTabIconIDs = 0x80270130; -D_80270148 = 0x80270148; -D_8027014C = 0x8027014C; -gStatsMenuIconIDs = 0x80270150; -gBadgeMenuItemIDs = 0x80270180; -gBadgeMenuCurrentPage = 0x80270280; -gBadgeMenuPages = 0x80270288; -D_80270289 = 0x80270289; -D_8027028A = 0x8027028A; -gBadgeMenuSelectedIndex = 0x80270378; -D_8027037C = 0x8027037C; -gBadgeMenuSelectedItemID = 0x80270380; -gBadgeMenuNumItems = 0x80270384; -D_80270388 = 0x80270388; -gBadgeMenuCurrentScrollPos = 0x8027038C; -gBadgeMenuTargetScrollPos = 0x80270390; -D_80270394 = 0x80270394; -gBadgeMenuLevel = 0x80270398; -gBadgeMenuCurrentTab = 0x8027039C; -gBadgeMenuBShowNotEnoughBP = 0x802703A0; -D_802703A8 = 0x802703A8; -D_802703FC = 0x802703FC; -gItemMenuItemIDs = 0x80270400; -gItemMenuCurrentPage = 0x802704C8; -gItemMenuPages = 0x802704D0; -D_802704D1 = 0x802704D1; -D_802704D2 = 0x802704D2; -gItemMenuSelectedIndex = 0x802705C0; -D_802705C4 = 0x802705C4; -gItemMenuSelectedItemID = 0x802705C8; -gItemMenuNumItems = 0x802705CC; -D_802705D0 = 0x802705D0; -gItemMenuCurrentScrollPos = 0x802705D4; -gItemMenuTargetScrollPos = 0x802705D8; -D_802705DC = 0x802705DC; -gItemMenuLevel = 0x802705E0; -gItemMenuCurrentTab = 0x802705E4; -gItemIcons = 0x802705E8; -D_80270634 = 0x80270634; -D_80270640 = 0x80270640; -D_80270660 = 0x80270660; -D_80270680 = 0x80270680; -D_802706A0 = 0x802706A0; -D_802706A4 = 0x802706A4; -D_802706A8 = 0x802706A8; -D_802706AC = 0x802706AC; -D_802706B0 = 0x802706B0; -D_802706C0 = 0x802706C0; -D_802706E0 = 0x802706E0; -D_802706FC = 0x802706FC; -D_80270700 = 0x80270700; -D_80270704 = 0x80270704; -D_80270708 = 0x80270708; -D_8027070C = 0x8027070C; -D_80270710 = 0x80270710; -D_80270714 = 0x80270714; -D_80270718 = 0x80270718; -D_8027071C = 0x8027071C; -D_80270720 = 0x80270720; -D_80270724 = 0x80270724; -D_80282EE9 = 0x80282EE9; -D_80282EEA = 0x80282EEA; -bMarioHideAnims = 0x80283370; -D_8029DA30 = 0x8029DA30; -D_8029DA33 = 0x8029DA33; -D_8029DA34 = 0x8029DA34; -D_8029DA40 = 0x8029DA40; -D_8029DA44 = 0x8029DA44; -D_8029DA48 = 0x8029DA48; -D_8029DA4C = 0x8029DA4C; -D_8029DA50 = 0x8029DA50; -D_8029EFB0 = 0x8029EFB0; -D_8029EFB4 = 0x8029EFB4; -D_8029EFB8 = 0x8029EFB8; -D_8029EFBC = 0x8029EFBC; -D_8029EFC0 = 0x8029EFC0; -D_8029EFE8 = 0x8029EFE8; -D_8029F010 = 0x8029F010; -D_8029F038 = 0x8029F038; -D_8029F236 = 0x8029F236; -D_8029F240 = 0x8029F240; -D_8029F244 = 0x8029F244; -D_8029F248 = 0x8029F248; -D_8029F24C = 0x8029F24C; -D_8029F250 = 0x8029F250; -D_8029F254 = 0x8029F254; -D_8029F258 = 0x8029F258; -D_8029F25C = 0x8029F25C; -D_8029F260 = 0x8029F260; -D_8029F264 = 0x8029F264; -D_8029F270 = 0x8029F270; -D_8029F274 = 0x8029F274; -D_8029F278 = 0x8029F278; -D_8029F27C = 0x8029F27C; -D_8029F27E = 0x8029F27E; -D_8029F280 = 0x8029F280; -D_8029F282 = 0x8029F282; -D_8029F284 = 0x8029F284; -D_8029F286 = 0x8029F286; -D_8029F288 = 0x8029F288; -D_8029F28C = 0x8029F28C; -D_8029F290 = 0x8029F290; -D_8029F294 = 0x8029F294; -D_8029F298 = 0x8029F298; -D_8029F29C = 0x8029F29C; -D_8029F29E = 0x8029F29E; -D_8029F2A0 = 0x8029F2A0; -D_8029F2A2 = 0x8029F2A2; -D_8029F2A3 = 0x8029F2A3; -D_8029F2A4 = 0x8029F2A4; -D_8029F2A5 = 0x8029F2A5; -D_8029F2A6 = 0x8029F2A6; -D_8029F2A7 = 0x8029F2A7; -D_8029F2A8 = 0x8029F2A8; -D_8029F2AC = 0x8029F2AC; -D_8029F2B0 = 0x8029F2B0; -D_8029F2B4 = 0x8029F2B4; -D_8029F2C0 = 0x8029F2C0; -D_8029F640 = 0x8029F640; -D_8029F642 = 0x8029F642; -D_8029F644 = 0x8029F644; -D_8029F646 = 0x8029F646; -D_8029F648 = 0x8029F648; -D_8029F64A = 0x8029F64A; -D_8029F64C = 0x8029F64C; -D_8029F64E = 0x8029F64E; -D_8029F650 = 0x8029F650; -gSpeakingActorPrintCtx = 0x8029FA60; -D_8029FA64 = 0x8029FA64; -gSpeakingActorPrintIsDone = 0x8029FA68; -gSpeakingActorTalkAnim = 0x8029FA6C; -gSpeakingActorIdleAnim = 0x8029FA70; -gSpeakingActor = 0x8029FA74; -gSpeakingActorPart = 0x8029FA78; -D_8029FA80 = 0x8029FA80; -D_8029FA88 = 0x8029FA88; -D_8029FA90 = 0x8029FA90; -D_8029FAA8 = 0x8029FAA8; -D_8029FAC4 = 0x8029FAC4; -D_8029FAE8 = 0x8029FAE8; -D_8029FB48 = 0x8029FB48; -D_8029FB4C = 0x8029FB4C; -D_8029FB50 = 0x8029FB50; -D_8029FB54 = 0x8029FB54; -D_8029FB60 = 0x8029FB60; -D_8029FB64 = 0x8029FB64; -D_8029FB68 = 0x8029FB68; -D_8029FB6C = 0x8029FB6C; -D_8029FB70 = 0x8029FB70; -D_8029FB74 = 0x8029FB74; -D_8029FB78 = 0x8029FB78; -D_8029FB7C = 0x8029FB7C; -D_8029FB80 = 0x8029FB80; -D_8029FB84 = 0x8029FB84; -D_8029FB88 = 0x8029FB88; -D_8029FB8C = 0x8029FB8C; -D_8029FB90 = 0x8029FB90; -D_8029FB94 = 0x8029FB94; -D_8029FB98 = 0x8029FB98; -D_8029FB9C = 0x8029FB9C; -D_8029FBA0 = 0x8029FBA0; -D_8029FBA4 = 0x8029FBA4; -D_8029FBA8 = 0x8029FBA8; -D_8029FBAC = 0x8029FBAC; -D_8029FBB0 = 0x8029FBB0; -D_8029FBC0 = 0x8029FBC0; -D_8029FBD0 = 0x8029FBD0; -D_8029FBD4 = 0x8029FBD4; -gActionCommandStatus = 0x8029FBE0; -D_8029FBE4 = 0x8029FBE4; -D_8029FC2A = 0x8029FC2A; -D_8029FC3E = 0x8029FC3E; -D_8029FC4C = 0x8029FC4C; -D_802A18E0 = 0x802A18E0; -D_802A19B0 = 0x802A19B0; -D_802A19C0 = 0x802A19C0; -D_802A1A90 = 0x802A1A90; -D_802A1AA0 = 0x802A1AA0; -D_802A1AC0 = 0x802A1AC0; -D_802A1B40 = 0x802A1B40; -D_802A1C90 = 0x802A1C90; -D_802A1CA0 = 0x802A1CA0; -D_802A1CD0 = 0x802A1CD0; -D_802A1CD4 = 0x802A1CD4; -D_802A1D60 = 0x802A1D60; -D_802A1D70 = 0x802A1D70; -D_802A1E70 = 0x802A1E70; -D_802A1E80 = 0x802A1E80; -D_802A1EB0 = 0x802A1EB0; -D_802A1EE0 = 0x802A1EE0; -D_802A2120 = 0x802A2120; -D_802A21C0 = 0x802A21C0; -D_802A21F0 = 0x802A21F0; -D_802A2410 = 0x802A2410; -D_802A24D0 = 0x802A24D0; -D_802A25C0 = 0x802A25C0; -D_802A25C8 = 0x802A25C8; -D_802A25E4 = 0x802A25E4; -D_802A25E8 = 0x802A25E8; -D_802A25EC = 0x802A25EC; -D_802A25F0 = 0x802A25F0; -D_802A25F4 = 0x802A25F4; -D_802A25F8 = 0x802A25F8; -D_802A25FC = 0x802A25FC; -D_802A2890 = 0x802A2890; -D_802A2C20 = 0x802A2C20; -D_802A2C50 = 0x802A2C50; -D_802A2CC0 = 0x802A2CC0; -D_802A2DD0 = 0x802A2DD0; -D_802A2DD8 = 0x802A2DD8; -D_802A2DEC = 0x802A2DEC; -D_802A2DF0 = 0x802A2DF0; -D_802A2DF4 = 0x802A2DF4; -D_802A2DF8 = 0x802A2DF8; -D_802A2DFC = 0x802A2DFC; -D_802A2E00 = 0x802A2E00; -D_802A37F0 = 0x802A37F0; -D_802A37F8 = 0x802A37F8; -D_802A3818 = 0x802A3818; -D_802A3834 = 0x802A3834; -D_802A3838 = 0x802A3838; -D_802A3F50 = 0x802A3F50; -D_802A3F58 = 0x802A3F58; -D_802A3F88 = 0x802A3F88; -D_802A4020 = 0x802A4020; -D_802A4350 = 0x802A4350; -D_802A43D0 = 0x802A43D0; -D_802A9620 = 0x802A9620; -D_802A98C0 = 0x802A98C0; -D_802A9920 = 0x802A9920; -D_802A9B00 = 0x802A9B00; -D_802A9F0C = 0x802A9F0C; -D_802A9F34 = 0x802A9F34; -D_802A9F5C = 0x802A9F5C; -D_802A9F84 = 0x802A9F84; -D_802A9FAC = 0x802A9FAC; -D_802AA320 = 0x802AA320; -D_802AA694 = 0x802AA694; -D_802AAA08 = 0x802AAA08; -D_802AAA30 = 0x802AAA30; -D_802ACC60 = 0x802ACC60; -D_802ACC64 = 0x802ACC64; -D_802ACC68 = 0x802ACC68; -D_802ACC6C = 0x802ACC6C; -D_802ACC70 = 0x802ACC70; -D_802ACCD0 = 0x802ACCD0; -D_802ACFE8 = 0x802ACFE8; -D_802ACFEC = 0x802ACFEC; -D_802ACFF0 = 0x802ACFF0; -D_802ACFF4 = 0x802ACFF4; -D_802ACFFC = 0x802ACFFC; -D_802ACFFD = 0x802ACFFD; -D_802AD000 = 0x802AD000; -D_802AD001 = 0x802AD001; -D_802AD002 = 0x802AD002; -D_802AD003 = 0x802AD003; -D_802AD004 = 0x802AD004; -D_802AD006 = 0x802AD006; -D_802AD008 = 0x802AD008; -D_802AD00A = 0x802AD00A; -D_802AD010 = 0x802AD010; -D_802AD028 = 0x802AD028; -D_802AD040 = 0x802AD040; -D_802AD044 = 0x802AD044; -D_802AD048 = 0x802AD048; -D_802AD04C = 0x802AD04C; -D_802AD050 = 0x802AD050; -D_802AD054 = 0x802AD054; -D_802AD058 = 0x802AD058; -D_802AD05C = 0x802AD05C; -D_802AD060 = 0x802AD060; -D_802AD064 = 0x802AD064; -D_802AD068 = 0x802AD068; -D_802AD069 = 0x802AD069; -D_802AD06A = 0x802AD06A; -D_802AD06B = 0x802AD06B; -D_802AD06C = 0x802AD06C; -D_802AD070 = 0x802AD070; -main_battle_menu_iconScripts = 0x802AD078; -battle_menu_messageIDs = 0x802AD090; -D_802AD0A8 = 0x802AD0A8; -main_menu_numOptions = 0x802AD0AC; -D_802AD0B0 = 0x802AD0B0; -D_802AD0B3 = 0x802AD0B3; -battle_menu_submenuIDs = 0x802AD0B8; -D_802AD0BB = 0x802AD0BB; -D_802AD0BC = 0x802AD0BC; -D_802AD0C0 = 0x802AD0C0; -battle_menu_isEnabled = 0x802AD0D0; -battle_menu_isMessageDisabled = 0x802AD0E8; -D_802AD0EB = 0x802AD0EB; -D_802AD100 = 0x802AD100; -D_802AD104 = 0x802AD104; -battle_menu_moveState = 0x802AD108; -battle_menu_moveCursorPos = 0x802AD109; -D_802AD10A = 0x802AD10A; -D_802AD10B = 0x802AD10B; -battle_menu_moveScrollLine = 0x802AD10C; -D_802AD10D = 0x802AD10D; -D_802AD10E = 0x802AD10E; -D_802AD10F = 0x802AD10F; -battle_menu_moveScrollOffset = 0x802AD110; -D_802AD112 = 0x802AD112; -battle_menu_moveTextColor = 0x802AD114; -battle_menu_moveTextOpacity = 0x802AD116; -battle_menu_moveCursorIcon = 0x802AD118; -battle_menu_moveUpArrowIcon = 0x802AD11C; -battle_menu_moveDownArrowIcon = 0x802AD120; -battle_menu_moveOptionIconIDs = 0x802AD128; -battle_menu_moveTitleIcon = 0x802AD188; -battle_menu_moveOptionCostUnitIconIDs = 0x802AD190; -battle_menu_moveX = 0x802AD1F0; -battle_menu_moveY = 0x802AD1F2; -battle_menu_moveOptionIndexMap = 0x802AD1F8; -D_802AD258 = 0x802AD258; -battle_menu_moveOptionIconScripts = 0x802AD260; -battle_menu_moveOptionNames = 0x802AD2C0; -battle_menu_moveOptionDisplayCosts = 0x802AD320; -battle_menu_moveOptionDisplayCostReductions = 0x802AD380; -battle_menu_moveOptionDisplayCostReductionColors = 0x802AD3E0; -battle_menu_moveOptionBPCosts = 0x802AD440; -battle_menu_hasSpiritsMenu = 0x802AD4A0; -battle_menu_moveOptionCount = 0x802AD4A4; -D_802AD4A7 = 0x802AD4A7; -D_802AD4A8 = 0x802AD4A8; -battle_menu_moveIndices = 0x802AD4B0; -D_802AD4B2 = 0x802AD4B2; -D_802AD4B3 = 0x802AD4B3; -battle_menu_moveOptionsEnabled = 0x802AD510; -battle_menu_moveOptionDescriptions = 0x802AD570; -battle_menu_moveOptionSortPriorities = 0x802AD5D0; -battle_menu_moveOptionCantUseTypes = 0x802AD5E8; -battle_menu_moveOptionActive = 0x802AD600; -D_802AD603 = 0x802AD603; -D_802AD604 = 0x802AD604; -D_802AD605 = 0x802AD605; -D_802AD606 = 0x802AD606; -D_802AD607 = 0x802AD607; -D_802AD608 = 0x802AD608; -D_802AD609 = 0x802AD609; -D_802AD60A = 0x802AD60A; -D_802AD60B = 0x802AD60B; -D_802AD60C = 0x802AD60C; -D_802AD60E = 0x802AD60E; -D_802AD610 = 0x802AD610; -D_802AD612 = 0x802AD612; -D_802AD614 = 0x802AD614; -D_802AD618 = 0x802AD618; -D_802AD61C = 0x802AD61C; -D_802AD620 = 0x802AD620; -D_802AD624 = 0x802AD624; -D_802AD628 = 0x802AD628; -D_802AD63C = 0x802AD63C; -D_802AD63E = 0x802AD63E; -D_802AD640 = 0x802AD640; -D_802AD658 = 0x802AD658; -D_802AD66C = 0x802AD66C; -D_802AD66F = 0x802AD66F; -D_802AD670 = 0x802AD670; -D_802AD673 = 0x802AD673; -D_802AD678 = 0x802AD678; -D_802AD67B = 0x802AD67B; -D_802AD690 = 0x802AD690; -D_802AD6A8 = 0x802AD6A8; -D_802AD6AA = 0x802AD6AA; -D_802AD6C0 = 0x802AD6C0; -D_802AD6D4 = 0x802AD6D4; -D_802B6240 = 0x802B6240; -D_802B62B0 = 0x802B62B0; -D_802B62D0 = 0x802B62D0; -D_802B62D4 = 0x802B62D4; -D_802B62D8 = 0x802B62D8; -D_802B62DC = 0x802B62DC; -D_802B62E0 = 0x802B62E0; -D_802B6730 = 0x802B6730; -D_802B6780 = 0x802B6780; -D_802B6784 = 0x802B6784; -D_802B6788 = 0x802B6788; -D_802B678C = 0x802B678C; -D_802B6790 = 0x802B6790; -D_802B6794 = 0x802B6794; -D_802B6798 = 0x802B6798; -D_802B679C = 0x802B679C; -D_802B68B0 = 0x802B68B0; -D_802B68B4 = 0x802B68B4; -D_802B68B8 = 0x802B68B8; -D_802B68BC = 0x802B68BC; -D_802B6E80 = 0x802B6E80; -D_802B6ED0 = 0x802B6ED0; -D_802B6ED4 = 0x802B6ED4; -D_802B6ED8 = 0x802B6ED8; -D_802B6EDC = 0x802B6EDC; -D_802B6EE0 = 0x802B6EE0; -D_802B6EE4 = 0x802B6EE4; -D_802B6EE8 = 0x802B6EE8; -D_802B6EEC = 0x802B6EEC; -D_802B6EF0 = 0x802B6EF0; -D_802B6EF4 = 0x802B6EF4; -D_802B9E00 = 0x802B9E00; -D_802BDF30 = 0x802BDF30; -D_802BDF34 = 0x802BDF34; -D_802BDF38 = 0x802BDF38; -D_802BDF60 = 0x802BDF60; -D_802BE0C0 = 0x802BE0C0; -D_802BE0C4 = 0x802BE0C4; -D_802BE0E4 = 0x802BE0E4; -D_802BE0E8 = 0x802BE0E8; -D_802BE0EC = 0x802BE0EC; -D_802BE300 = 0x802BE300; -D_802BE304 = 0x802BE304; -D_802BE308 = 0x802BE308; -D_802BE30C = 0x802BE30C; -D_802BE310 = 0x802BE310; -D_802BE920 = 0x802BE920; -D_802BE924 = 0x802BE924; -D_802BE928 = 0x802BE928; -D_802BE92C = 0x802BE92C; -D_802BE930 = 0x802BE930; -D_802BE934 = 0x802BE934; -D_802BE938 = 0x802BE938; -D_802BEBB0 = 0x802BEBB0; -D_802BEBB4 = 0x802BEBB4; -D_802BEBB8 = 0x802BEBB8; -D_802BEBBC = 0x802BEBBC; -D_802BEBC4 = 0x802BEBC4; -D_802BEC50 = 0x802BEC50; -D_802BEC54 = 0x802BEC54; -D_802BEC58 = 0x802BEC58; -D_802BEC5C = 0x802BEC5C; -D_802BEC60 = 0x802BEC60; -D_802BEC64 = 0x802BEC64; -D_802BEC68 = 0x802BEC68; -D_802BEC6C = 0x802BEC6C; -D_802BEC70 = 0x802BEC70; -D_802BEC74 = 0x802BEC74; -D_802BEC78 = 0x802BEC78; -D_802BFF00 = 0x802BFF00; -D_802BFF04 = 0x802BFF04; -D_802BFF08 = 0x802BFF08; -D_802BFF0C = 0x802BFF0C; -D_802BFF10 = 0x802BFF10; -D_802BFF14 = 0x802BFF14; -D_802BFF18 = 0x802BFF18; -D_802BFF1C = 0x802BFF1C; -D_802BFF20 = 0x802BFF20; -D_802BFF24 = 0x802BFF24; -D_802BFF28 = 0x802BFF28; -D_802C0000 = 0x802C0000; -D_802C05CC = 0x802C05CC; -gMapFlags = 0x802DA480; -gMapVars = 0x802DA484; -gNumScripts = 0x802DA488; -gWorldScriptList = 0x802DA490; -gBattleScriptList = 0x802DA690; -gCurrentScriptListPtr = 0x802DA890; -gScriptIndexList = 0x802DA898; -gScriptIdList = 0x802DAA98; -gScriptListCount = 0x802DAC98; -D_802DACA0 = 0x802DACA0; -gLavaResetList = 0x802DADA0; -D_802DADA4 = 0x802DADA4; -gBattleMeshAnimationList = 0x802DADB0; -gWorldMeshAnimationList = 0x802DADF0; -gCurrentMeshAnimationListPtr = 0x802DAE30; -D_802DAE40 = 0x802DAE40; -D_802DAE44 = 0x802DAE44; -D_802DAE50 = 0x802DAE50; -D_802DAE54 = 0x802DAE54; -gCurrentPrintContext = 0x802DB260; -D_802DB264 = 0x802DB264; -D_802DB268 = 0x802DB268; -D_802DB5B0 = 0x802DB5B0; -D_802DB5C0 = 0x802DB5C0; -D_802DB6C0 = 0x802DB6C0; -D_802DB7C0 = 0x802DB7C0; -D_802DB7D0 = 0x802DB7D0; -D_802DB7D8 = 0x802DB7D8; -D_802DB800 = 0x802DB800; -D_802DB830 = 0x802DB830; -D_802DBB60 = 0x802DBB60; -D_802DBB68 = 0x802DBB68; -gWorldMapFlags = 0x802DBC70; -D_802DBC7C = 0x802DBC7C; -D_802DBC88 = 0x802DBC88; -gWorldMapVars = 0x802DBCA8; -gBattleMapVars = 0x802DBCE8; -D_802DBD28 = 0x802DBD28; -gBattleMapFlags = 0x802DBD34; -spr_allocateBtlComponentsOnWorldHeap = 0x802DF524; -D_802DF530 = 0x802DF530; -D_802DF540 = 0x802DF540; -spr_playerSprites = 0x802DF548; -D_802DF578 = 0x802DF578; -D_802DF57C = 0x802DF57C; -spr_playerMaxComponents = 0x802DF580; -spr_playerCurrentAnimInfo = 0x802DF588; -D_802DF58C = 0x802DF58C; -D_802DF590 = 0x802DF590; -spr_npcSprites = 0x802DF5B0; -spr_npcSpriteInstanceCount = 0x802DF958; -D_802DFA48 = 0x802DFA48; -D_802DFA4C = 0x802DFA4C; -D_802DFA58 = 0x802DFA58; -D_802DFE44 = 0x802DFE44; -D_802DFE48 = 0x802DFE48; -D_802DFE9C = 0x802DFE9C; -D_802DFEA0 = 0x802DFEA0; -D_802DFEAC = 0x802DFEAC; -D_802DFEB0 = 0x802DFEB0; -D_802DFEB8 = 0x802DFEB8; -D_802E004C = 0x802E004C; -D_802E0050 = 0x802E0050; -D_802E0080 = 0x802E0080; -D_802E0090 = 0x802E0090; -D_802E0C10 = 0x802E0C10; -D_802E0C14 = 0x802E0C14; -D_802E0C20 = 0x802E0C20; -D_802E0C58 = 0x802E0C58; -D_802E0C5C = 0x802E0C5C; -D_802E0C60 = 0x802E0C60; -D_802E0C64 = 0x802E0C64; -D_802E0C68 = 0x802E0C68; -D_802E0C70 = 0x802E0C70; -D_802EB390 = 0x802EB390; -D_802EB394 = 0x802EB394; -D_802EB398 = 0x802EB398; -D_802EB39C = 0x802EB39C; -D_802EB3A0 = 0x802EB3A0; -D_802EB3B0 = 0x802EB3B0; -D_802EB3C0 = 0x802EB3C0; -D_802ED970 = 0x802ED970; -D_802EE8D0 = 0x802EE8D0; -D_802F39D0 = 0x802F39D0; -D_802F4560 = 0x802F4560; -D_802FB800 = 0x802FB800; -gSpriteHeapPtr = 0x8034F800; -D_803DA800 = 0x803DA800; -D_8887FFFB = 0x8887FFFB; -D_A0000000 = 0xA0000000; -D_A4000000 = 0xA4000000; -D_A4000768 = 0xA4000768; -D_A4001000 = 0xA4001000; -D_A4040010 = 0xA4040010; -D_A4300000 = 0xA4300000; -D_A4300004 = 0xA4300004; -D_A4300008 = 0xA4300008; -D_A430000C = 0xA430000C; -D_A4400010 = 0xA4400010; -D_A450000C = 0xA450000C; -D_A4600004 = 0xA4600004; -D_A460000C = 0xA460000C; -D_A4600010 = 0xA4600010; -D_A4700000 = 0xA4700000; -D_A4700010 = 0xA4700010; -D_A4800018 = 0xA4800018; -D_A6000000 = 0xA6000000; -D_B0000000 = 0xB0000000; -D_B0000008 = 0xB0000008; -D_B0000010 = 0xB0000010; -D_D9FCFFFF = 0xD9FCFFFF; -D_E001C5E0 = 0xE001C5E0; -D_E007EC2F = 0xE007EC2F; -D_E00963E0 = 0xE00963E0; -D_E1000010 = 0xE1000010; -D_E7000008 = 0xE7000008; -D_E8000008 = 0xE8000008; -D_F0000008 = 0xF0000008; -D_F1FFFFFF = 0xF1FFFFFF; -D_F5000007 = 0xF5000007; -D_F79DDD0F = 0xF79DDD0F; -D_FA000028 = 0xFA000028; -D_FD100008 = 0xFD100008; -jtbl_8009A578 = 0x8009A578; -jtbl_8009A590 = 0x8009A590; -jtbl_8026FF60 = 0x8026FF60; -D_8026FF80 = 0x8026FF80; -D_8026FF88 = 0x8026FF88; -D_8026FF90 = 0x8026FF90; -D_8026FF98 = 0x8026FF98; -D_8026FFA0 = 0x8026FFA0; -D_8026FFA8 = 0x8026FFA8; -D_8026FB30 = 0x8026FB30; -D_8026FC48 = 0x8026FC48; -D_8026FC10 = 0x8026FC10; -D_8026F348 = 0x8026F348; -D_8026FFB0 = 0x8026FFB0; -D_8026FBD8 = 0x8026FBD8; -D_8026FCF0 = 0x8026FCF0; -D_8026FCB8 = 0x8026FCB8; -D_80270040 = 0x80270040; -D_8026FD98 = 0x8026FD98; -D_80270048 = 0x80270048; -D_8026F5A0 = 0x8026F5A0; -D_8026A2B0 = 0x8026A2B0; -D_80270050 = 0x80270050; -D_80270058 = 0x80270058; -D_80270060 = 0x80270060; -D_80270068 = 0x80270068; -D_80270070 = 0x80270070; -D_8026FE78 = 0x8026FE78; -D_8026F118 = 0x8026F118; -D_802510B0 = 0x802510B0; -D_8026F1B8 = 0x8026F1B8; -D_8026F2A0 = 0x8026F2A0; -D_8026FEE8 = 0x8026FEE8; -D_80270080 = 0x80270080; -D_80270088 = 0x80270088; -D_80270090 = 0x80270090; -D_80270098 = 0x80270098; -D_802700A0 = 0x802700A0; -D_802700A8 = 0x802700A8; -D_802700B0 = 0x802700B0; -D_802700B8 = 0x802700B8; -D_8026F778 = 0x8026F778; -D_8026F8D4 = 0x8026F8D4;