BSS, undefined_syms (#891)

2024-09-16 14:32:37 +02:00 · 2022-12-16 22:20:37 -05:00 · 2022-12-16 22:20:37 -05:00 · 03c7e0d80d
commit 03c7e0d80d
parent 63072fe0c1
92 changed files with 401 additions and 648 deletions
--- a/include/dead.h
+++ b/include/dead.h
@ -67,7 +67,7 @@
 #define switch_to_partner dead_switch_to_partner
 #define set_npc_yaw dead_set_npc_yaw
 #define disable_npc_shadow dead_disable_npc_shadow
-#define func_800EB2A4 func_800F2E98
+#define func_800EB2A4 dead_func_800EB2A4
 #define partner_clear_player_tracking dead_partner_clear_player_tracking
 #define sfx_play_sound_with_params dead_sfx_play_sound_with_params
 #define sfx_get_spatialized_sound_params dead_sfx_get_spatialized_sound_params
--- a/include/variables.h
+++ b/include/variables.h
@ -111,8 +111,6 @@ extern SpriteShadingProfile* D_80151328;

 extern Window gWindows[64];

-extern s32 D_802A3838;
-
 extern s32 gEncounterState;
 extern s16 gNpcCount;
 extern s32 gOverrideFlags;
--- a/src/a5dd0_len_114e0.c
+++ b/src/a5dd0_len_114e0.c
@ -1090,6 +1090,7 @@ extern s32 mdl_renderTaskQueueIdx;
 extern s32 mdl_renderTaskCount;

 extern TextureHandle mdl_textureHandles[128];
+
 extern RenderTask mdl_clearRenderTasks[3][0x100];

 extern s32 D_801A7000; // todo ???
--- a/src/battle/action_cmd.c
+++ b/src/battle/action_cmd.c
@ -1,5 +1,4 @@
 #include "common.h"
-#include "action_cmd.h"
 #include "ld_addrs.h"

 u8 mashMeter_bgColors[15] = {
@ -85,6 +84,11 @@ BSS s32 D_8029FBC4_pad[3];
 // TODO move to actor_api
 BSS s32 D_8029FBD0;
 BSS s8 D_8029FBD4;
+BSS s32 D_8029FBD8_pad[2];
+
+#include "action_cmd.h"
+
+BSS ActionCommandStatus gActionCommandStatus;

 ApiStatus LoadActionCommand(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/battle/action_cmd.h
+++ b/src/battle/action_cmd.h
@ -76,31 +76,7 @@ typedef struct ActionCommandStatus {
    /* 0x80 */ s8 mashMeterIntervals;
 } ActionCommandStatus;

-extern ActionCommandStatus gActionCommandStatus; // TODO BSS?
-
-extern s32 actionCmdTableJump[];
-extern s32 actionCmdTableHammer[];
-extern s32 actionCmdTableFlee[];
-extern s32 actionCmdTableBreakFree[];
-extern s32 actionCmdTableWhirlwind[];
-extern s32 actionCmdTableStopLeech[];
-extern s32 actionCmdTable07[];
-extern s32 actionCmdTableDizzyShell[];
-extern s32 actionCmdTableFireShell[];
-extern s32 actionCmdTable0A[];
-extern s32 actionCmdTableBomb[];
-extern s32 actionCmdTableBodySlam[];
-extern s32 actionCmdTableAirLift[];
-extern s32 actionCmdTableAirRaid[];
-extern s32 actionCmdTableSquirt[];
-extern s32 actionCmdTablePowerShock[];
-extern s32 actionCmdTableMegaShock[];
-extern s32 actionCmdTableSmack[];
-extern s32 actionCmdTableSpinySurge[];
-extern s32 actionCmdTableHurricane[];
-extern s32 actionCmdTableSpook[];
-extern s32 actionCmdTableWaterBlock[];
-extern s32 actionCmdTableTidalWave[];
+extern ActionCommandStatus gActionCommandStatus;

 extern HudScript HES_100pct;
 extern HudScript HES_AButton;
--- a/src/battle/action_cmd/07.c
+++ b/src/battle/action_cmd/07.c
@ -3,9 +3,11 @@

 #define NAMESPACE action_command_07

+void func_8024FAFC(void);
+
 BSS s32 D_802A9620;

-void func_8024FAFC(void);
+extern s32 actionCmdTable07[];

 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
--- a/src/battle/action_cmd/0A.c
+++ b/src/battle/action_cmd/0A.c
@ -3,6 +3,8 @@

 #define NAMESPACE action_command_0A

+extern s32 actionCmdTable0A[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/air_lift.c
+++ b/src/battle/action_cmd/air_lift.c
@ -8,6 +8,8 @@ s32 D_802A9852_4292C0[] = { 0, 25, 50, 75, 75, 0, 0, 0 };

 BSS s32 air_lift_bss_0;

+extern s32 actionCmdTableAirLift[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    s32 *args = script->ptrReadPos;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/air_raid.c
+++ b/src/battle/action_cmd/air_raid.c
@ -9,6 +9,8 @@ s32 D_802A9984_429CA4[] = { 40, 70, 99, 200, };
 s32 D_802A9994_429CB4[] = { 35, 60, 80, 99, 200, };
 s32 D_802A99A8_429CC8[] = { 35, 35, 60, 80, 99, 200, };

+extern s32 actionCmdTableAirRaid[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/body_slam.c
+++ b/src/battle/action_cmd/body_slam.c
@ -3,6 +3,8 @@

 #define NAMESPACE action_command_body_slam

+extern s32 actionCmdTableBodySlam[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/bomb.c
+++ b/src/battle/action_cmd/bomb.c
@ -5,6 +5,8 @@

 s32 D_802A9810_428280[] = { 0, 25, 50, 75, 75, 0, 0, 0 };

+extern s32 actionCmdTableBomb[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/break_free.c
+++ b/src/battle/action_cmd/break_free.c
@ -3,6 +3,8 @@

 #define NAMESPACE action_command_break_free

+extern s32 actionCmdTableBreakFree[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/dizzy_shell.c
+++ b/src/battle/action_cmd/dizzy_shell.c
@ -6,6 +6,8 @@

 s32 D_802A9800_426970[8] = { 0, 25, 50, 75, 75, 0, 0, 0 };

+extern s32 actionCmdTableDizzyShell[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/fire_shell.c
+++ b/src/battle/action_cmd/fire_shell.c
@ -9,6 +9,8 @@ s32 D_802A9964_427334[4] = { 40, 70, 99, 200 };
 s32 D_802A9974_427344[5] = { 35, 60, 80, 99, 200 };
 s32 D_802A9988_427358[6] = { 35, 35, 60, 80, 99, 200 };

+extern s32 actionCmdTableFireShell[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/flee.c
+++ b/src/battle/action_cmd/flee.c
@ -5,6 +5,8 @@

 BSS s32 D_802A9920;

+extern s32 actionCmdTableFlee[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/hammer.c
+++ b/src/battle/action_cmd/hammer.c
@ -3,6 +3,8 @@

 #define NAMESPACE action_command_hammer

+extern s32 actionCmdTableHammer[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/hurricane.c
+++ b/src/battle/action_cmd/hurricane.c
@ -5,6 +5,8 @@

 s32 D_802A98E0_42FFC0[8] = { 0, 25, 50, 75, 75, 0, 0, 0 };

+extern s32 actionCmdTableHurricane[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/jump.c
+++ b/src/battle/action_cmd/jump.c
@ -3,6 +3,8 @@

 #define NAMESPACE action_command_jump

+extern s32 actionCmdTableJump[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    s32 hudElement;
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
--- a/src/battle/action_cmd/mega_shock.c
+++ b/src/battle/action_cmd/mega_shock.c
@ -6,6 +6,8 @@

 s32 D_802A9930_42E340[] = { 0, 25, 50, 75, 75, 0, 0, 0 };

+extern s32 actionCmdTableMegaShock[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    BattleStatus* battleStatus = &gBattleStatus;
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
--- a/src/battle/action_cmd/power_shock.c
+++ b/src/battle/action_cmd/power_shock.c
@ -5,7 +5,9 @@

 s32 D_802A9AA0_42D9B0[] = { 0, 25, 50, 75, 75, 0, 0, 0};

-static s32 D_802A9B00;
+BSS s32 D_802A9B00;
+
+extern s32 actionCmdTablePowerShock[];

 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
@ -32,7 +34,7 @@ ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    actionCommandStatus->hudPosX = -48;
    actionCommandStatus->isBarFilled = FALSE;
    actionCommandStatus->thresholdMoveDir = 0;
-    D_802A9B00 = 0;
+    D_802A9B00 = FALSE;
    actionCommandStatus->hudPosY = 80;

    id = hud_element_create(&HES_AButton);
@ -156,7 +158,7 @@ void N(update)(void) {
            hud_element_set_script(actionCommandStatus->hudElements[0], &HES_MashAButton);
            actionCommandStatus->barFillLevel = 0;
            actionCommandStatus->unk_5C = 0;
-            D_802A9B00 = 1;
+            D_802A9B00 = TRUE;
            actionCommandStatus->frameCounter = actionCommandStatus->duration;
            sfx_play_sound_with_params(SOUND_80000041, 0, 0, 0);
            actionCommandStatus->state = 11;
@ -299,7 +301,7 @@ void N(draw)(void) {
    // Redundant call, but needed to match.
    hud_element_get_render_pos(id, &x, &y);

-    if (D_802A9B00 == 0) {
+    if (!D_802A9B00) {
        draw_mash_meter_multicolor_with_divisor(x, y, actionCommandStatus->barFillLevel / 100, 1);
    } else if (!actionCommandStatus->isBarFilled) {
        draw_mash_meter_multicolor_with_divisor(x, y, actionCommandStatus->barFillLevel / 100, 4);
--- a/src/battle/action_cmd/smack.c
+++ b/src/battle/action_cmd/smack.c
@ -33,6 +33,8 @@ s32 D_802A9A20_42EDC0[] = {
    0x23, 0x3C, 0x50, 0x63, 0xC8, 0x00,
 };

+extern s32 actionCmdTableSmack[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/spiny_surge.c
+++ b/src/battle/action_cmd/spiny_surge.c
@ -7,6 +7,8 @@ s32 D_802A9860_42F680[8] = { 0, 25, 50, 75, 75, 0, 0, 0 };

 BSS s32 D_802A98C0;

+extern s32 actionCmdTableSpinySurge[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/spook.c
+++ b/src/battle/action_cmd/spook.c
@ -6,6 +6,8 @@

 s32 D_802A9920_430940[8] = { 0, 25, 50, 75, 75, 0, 0, 0 };

+extern s32 actionCmdTableSpook[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/squirt.c
+++ b/src/battle/action_cmd/squirt.c
@ -6,6 +6,8 @@
 s32 D_802A9760_42A480[] = { 300, 300, 265, 220, 175, 175, };
 s32 D_802A9778_42A498[] = { 300, 300, 265, 220, 175, 175, };

+extern s32 actionCmdTableSquirt[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/stop_leech.c
+++ b/src/battle/action_cmd/stop_leech.c
@ -3,6 +3,8 @@

 #define NAMESPACE action_command_stop_leech

+extern s32 actionCmdTableStopLeech[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/tidal_wave.c
+++ b/src/battle/action_cmd/tidal_wave.c
@ -6,6 +6,8 @@
 HudScript* D_802A97C0_42CEB0[3] = { &HES_PressAButton, &HES_PressBButton, &HES_PressCDownButton };
 HudScript* D_802A97CC_42CEBC[3] = { &HES_AButtonDown, &HES_BButtonHeld, &HES_CDownButtonHeld };

+extern s32 actionCmdTableTidalWave[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/water_block.c
+++ b/src/battle/action_cmd/water_block.c
@ -107,6 +107,8 @@ HudScript* D_802AB184_42C674[] = {
    &HES_WaterBlock1, &HES_WaterBlock2, &HES_WaterBlock3, &HES_WaterBlock4, &HES_WaterBlock4, &HES_WaterBlock4, &HES_WaterBlock4, &HES_WaterBlock4, &HES_WaterBlock4, 0, 0
 };

+extern s32 actionCmdTableWaterBlock[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/action_cmd/whirlwind.c
+++ b/src/battle/action_cmd/whirlwind.c
@ -59,6 +59,8 @@ HudScript* D_802AA8A0_425510[] = {

 s32 D_802AA8B4_425524[] = { 3, 3, 3, 3, 2, 2, 2, 1, 1, 1, 1 };

+extern s32 actionCmdTableWhirlwind[];
+
 ApiStatus N(init)(Evt* script, s32 isInitialCall) {
    ActionCommandStatus* actionCommandStatus = &gActionCommandStatus;
    BattleStatus* battleStatus = &gBattleStatus;
--- a/src/battle/area_kzn2/actor/lava_piranha.c
+++ b/src/battle/area_kzn2/actor/lava_piranha.c
@ -285,8 +285,8 @@ enum {
    VINE_3_BASE = 0x8022C000,
 };

-static LavaPiranhaVine N(VineData)[NUM_VINES];
-static s32 N(VineRenderState);
+BSS LavaPiranhaVine N(VineData)[NUM_VINES];
+BSS s32 N(VineRenderState);

 void N(make_vine_interpolation)(LavaPiranhaVine* vine) {
    Evt dummyEvt;
--- a/src/battle/item/mystery.c
+++ b/src/battle/item/mystery.c
@ -8,14 +8,15 @@

 extern IconHudScriptPair gItemHudScripts[];

-extern s32 D_802A25C8[7];
-extern s32 D_802A25E4;
-extern s32 D_802A25E8;
-extern s32 D_802A25EC;
-extern s32 D_802A25F0;
-extern s32 D_802A25F4;
-extern s32 D_802A25F8;
-extern s32* D_802A25FC;
+BSS s32 D_802A25C4; // unused?
+BSS s32 D_802A25C8[7];
+BSS s32 D_802A25E4;
+BSS s32 D_802A25E8;
+BSS s32 D_802A25EC;
+BSS s32 D_802A25F0;
+BSS s32 D_802A25F4;
+BSS s32 D_802A25F8;
+BSS s32* D_802A25FC;

 void N(func_802A123C_72C7EC(void)) {
    s32 var_s3;
--- a/src/battle/item/pebble.c
+++ b/src/battle/item/pebble.c
@ -41,7 +41,7 @@ Gfx N(displayList)[] = {
 };

 s32 N(modelCommandList)[] = {
-    0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), &N(displayList), 0x00000002, 0x00000000,
+    0x00000004, 0x0000000D, 0x00000001, sizeof(N(displayList)) / sizeof(s32), (s32) &N(displayList), 0x00000002, 0x00000000,
 };

 EvtScript N(main) = {
--- a/src/battle/item/sleepy_sheep.c
+++ b/src/battle/item/sleepy_sheep.c
@ -16,8 +16,11 @@ void virtual_entity_delete_by_index(s32);
 extern s32 D_802A3E88_7214D8[];
 extern EntityModelScript* D_802A3F28_721578[10];
 extern f32 D_802A3F00_721550[];
-extern Vec3f D_802A3F88;
-extern s32 D_802A3F58[10];
+
+BSS s32 D_802A3F54; // unused?
+BSS s32 D_802A3F58[10];
+BSS s32 D_802A3F80[2]; // unused?
+BSS Vec3f D_802A3F88;

 ApiStatus N(func_802A123C_71E88C)(Evt* script, s32 isInitialCall) {
    Vec3f* posPtr = &D_802A3F88;
--- a/src/battle/item/strange_cake.c
+++ b/src/battle/item/strange_cake.c
@ -10,14 +10,14 @@
 extern HudScript* N(D_802A2848_732B48)[];
 extern s32 N(D_802A2858_732B58)[];

-extern s32 D_802A2DD8[5];
-extern s32 D_802A2DE4;
-extern s32 D_802A2DEC;
-extern s32 D_802A2DF0;
-extern s32 D_802A2DF4;
-extern s32 D_802A2DF8;
-extern s32 D_802A2DFC;
-extern s32 D_802A2E00;
+BSS s32 D_802A2DD4; // unused?
+BSS s32 D_802A2DD8[5];
+BSS s32 D_802A2DEC;
+BSS s32 D_802A2DF0;
+BSS s32 D_802A2DF4;
+BSS s32 D_802A2DF8;
+BSS s32 D_802A2DFC;
+BSS s32 D_802A2E00;

 void N(func_802A123C_73153C(void)) {
    s32 var_s3;
--- a/src/battle/move/hammer_charge_1/7595B0.c
+++ b/src/battle/move/hammer_charge_1/7595B0.c
@ -1,7 +1,7 @@
 #include "common.h"
 #include "effects.h"

-extern s32 D_802A43D0;
+BSS s32 D_802A43D0;

 #define NAMESPACE battle_move_hammer_charge_1

--- a/src/battle/move/hammer_charge_2/75E5D0.c
+++ b/src/battle/move/hammer_charge_2/75E5D0.c
@ -1,7 +1,7 @@
 #include "common.h"
 #include "effects.h"

-extern s32 D_802A4350;
+BSS s32 D_802A4350;

 #define NAMESPACE battle_move_hammer_charge_2

--- a/src/battle/move/jump_charge_1/75C980.c
+++ b/src/battle/move/jump_charge_1/75C980.c
@ -1,7 +1,7 @@
 #include "common.h"
 #include "effects.h"

-extern s32 D_802A2C50;
+BSS s32 D_802A2C50;

 #define NAMESPACE battle_move_jump_charge_1

--- a/src/battle/move/jump_charge_2/761920.c
+++ b/src/battle/move/jump_charge_2/761920.c
@ -1,7 +1,7 @@
 #include "common.h"
 #include "effects.h"

-extern s32 D_802A2C20;
+BSS s32 D_802A2C20;

 #define NAMESPACE battle_move_jump_charge_2

--- a/src/battle/move/power_bounce/743DF0.c
+++ b/src/battle/move/power_bounce/743DF0.c
@ -4,7 +4,8 @@
 #define NAMESPACE battle_move_power_bounce

 extern s32 D_802A2730_745520;
-extern s32 D_802A4020;
+
+BSS s32 D_802A4020;

 #include "world/common/todo/UnkMoveFunc1.inc.c"

--- a/src/battle/partner/lakilester.c
+++ b/src/battle/partner/lakilester.c
@ -1364,7 +1364,6 @@ ApiStatus N(ProcessHurricane)(Evt* script, s32 isInitialCall) {
    static s32 D_8023D278;
    static HurricaneState* hurricaneState = &sHurricaneState;

-
    if (isInitialCall) {
        script->functionTemp[0] = 0;
    }
--- a/src/battle/star/chill_out/7900D0.c
+++ b/src/battle/star/chill_out/7900D0.c
@ -4,7 +4,7 @@

 #define NAMESPACE battle_star_chill_out

-extern s32 D_802A2CC0;
+BSS s32 D_802A2CC0;

 #include "common/StarPower.inc.c"

--- a/src/effects.c
+++ b/src/effects.c
@ -59,7 +59,7 @@ EffectTableEntry gEffectTable[] = {
    /* 0x1D */ FX_ENTRY(smoke_impact, effect_gfx_landing_dust),
    /* 0x1E */ FX_ENTRY(damage_indicator, effect_gfx_damage_indicator),
    /* 0x1F */ FX_ENTRY(purple_ring, effect_gfx_purple_ring),
-    /* 0x20 */ FX_ENTRY(flame, _353BB0),
+    /* 0x20 */ FX_ENTRY(flame, effect_gfx_flame),
    /* 0x21 */ FX_ENTRY(stars_burst, effect_gfx_damage_stars),
    /* 0x22 */ FX_ENTRY(stars_shimmer, effect_gfx_sparkles),
    /* 0x23 */ FX_ENTRY(rising_bubble, effect_gfx_rising_bubble),
--- a/src/effects/flame.c
+++ b/src/effects/flame.c
@ -16,16 +16,16 @@ typedef struct UnkStruct {
    /* 0x0C */ Gfx* unk_0C;
 } UnkStruct; // size = 0x10

-extern Gfx D_09000800[];
-extern Gfx D_090008F8[];
-extern Gfx D_09000918[];
-extern Gfx D_090009E0[];
+extern Gfx D_09000800_3543B0[];
+extern Gfx D_090008F8_3544A8[];
+extern Gfx D_09000918_3544C8[];
+extern Gfx D_090009E0_354590[];

 UnkStruct D_E0040840[] = {
-    { 255, 109, 255,  92, 102, 191, 255, 75,  50, {}, D_09000800 },
-    { 255, 255, 255,   0, 255,  32,   0, 75, 100, {}, D_09000800 },
-    { 255,   0, 255,  92, 107, 168, 255, 75,  10, {}, D_09000800 },
-    { 255, 255, 255, 244, 247, 175, 175, 22,  30, {}, D_09000800 }
+    { 255, 109, 255,  92, 102, 191, 255, 75,  50, {}, D_09000800_3543B0 },
+    { 255, 255, 255,   0, 255,  32,   0, 75, 100, {}, D_09000800_3543B0 },
+    { 255,   0, 255,  92, 107, 168, 255, 75,  10, {}, D_09000800_3543B0 },
+    { 255, 255, 255, 244, 247, 175, 175, 22,  30, {}, D_09000800_3543B0 }
 };

 s32 D_E0040880;
@ -49,7 +49,7 @@ void flame_main(
    FlameFXData* data;
    s32 numParts = 1;

-    if (arg0 >= 4) {
+    if (arg0 > 3) {
        arg0 = 3;
    }

@ -120,7 +120,8 @@ void flame_render(EffectInstance* effect) {
    f32 outZ;
    f32 outS;

-    shim_transform_point(gCameras[gCurrentCameraID].perspectiveMatrix, data->pos.x, data->pos.y, data->pos.z, 1.0f, &outX, &outY, &outZ, &outS);
+    shim_transform_point(gCameras[gCurrentCameraID].perspectiveMatrix, data->pos.x, data->pos.y, data->pos.z, 1.0f,
+                         &outX, &outY, &outZ, &outS);

    outDist = outZ + 5000;
    if (outDist < 0) {
@ -157,10 +158,10 @@ void flame_appendGfx(void* effect) {

    if (D_E0040880 != gGameStatusPtr->frameCounter) {
        D_E0040880 = gGameStatusPtr->frameCounter;
-        gSPDisplayList(gMasterGfxPos++, D_09000918);
+        gSPDisplayList(gMasterGfxPos++, D_09000918_3544C8);
        gDPSetTileSize(gMasterGfxPos++, 1, uls, ult, uls + 128, ult + 256);
-        gSPDisplayList(gMasterGfxPos++, D_090009E0);
-        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 320, VIRTUAL_TO_PHYSICAL(nuGfxCfb_ptr));
+        gSPDisplayList(gMasterGfxPos++, D_090009E0_354590);
+        gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(nuGfxCfb_ptr));
        gDPSetScissorFrac(gMasterGfxPos++, G_SC_NON_INTERLACE,
            camera->viewportStartX * 4.0f,
            camera->viewportStartY * 4.0f,
@ -183,8 +184,9 @@ void flame_appendGfx(void* effect) {
    shim_guMtxCatF(sp58, sp98, sp98);
    shim_guMtxF2L(sp98, &gDisplayContext->matrixStack[gMatrixListPos]);

-    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
-    gSPDisplayList(gMasterGfxPos++, D_090008F8);
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    gSPDisplayList(gMasterGfxPos++, D_090008F8_3544A8);
    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
    gDPPipeSync(gMasterGfxPos++);
 }
--- a/src/effects/gfx/flame.c
+++ b/src/effects/gfx/flame.c
@ -0,0 +1,69 @@
+#include "effects/gfx/D_09000000_353BB0.png.inc.c"
+#include "effects/gfx/D_09000200_353DB0.png.inc.c"
+#include "effects/gfx/D_09000400_353FB0.png.inc.c"
+#include "effects/gfx/D_09000600_3541B0.png.inc.c"
+
+extern unsigned char D_000B32E0[]; // TODO look into segmented address weirdnes
+extern unsigned char D_000B3AE0[]; // TODO look into segmented address weirdnes
+
+//#include "effects/gfx/D_09000800_3543B0.gfx.inc.c"
+#include "common.h"
+Gfx D_09000800_3543B0[] = {
+    gsDPPipeSync(),
+    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
+    gsDPSetCycleType(G_CYC_2CYCLE),
+    gsDPSetTexturePersp(G_TP_PERSP),
+    gsDPSetTextureDetail(G_TD_CLAMP),
+    gsDPSetTextureLOD(G_TL_TILE),
+    gsDPSetTextureFilter(G_TF_BILERP),
+    gsDPSetTextureConvert(G_TC_FILT),
+    gsDPSetColorDither(G_CD_MAGICSQ),
+    gsDPSetAlphaDither(G_AD_PATTERN),
+    gsDPSetTextureLUT(G_TT_NONE),
+    gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2),
+    gsDPLoadTextureTile(D_000B32E0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 0, 0, 0, 31, 63, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPSetCombineLERP(TEXEL0, CENTER, SCALE, ENVIRONMENT, 0, 0, 0, TEXEL0, 0, PRIMITIVE, COMBINED, ENVIRONMENT, 0, 0, 0, COMBINED),
+    gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH),
+    gsSPEndDisplayList(),
+};
+
+#include "effects/gfx/D_090008B8_354468.vtx.inc.c"
+#include "effects/gfx/D_090008F8_3544A8.gfx.inc.c"
+#include "effects/gfx/D_09000918_3544C8.gfx.inc.c"
+
+//#include "effects/gfx/D_090009E0_354590.gfx.inc.c"
+Gfx D_090009E0_354590[] = {
+    gsDPSetColorImage(G_IM_FMT_I, G_IM_SIZ_8b, 32, D_000B3AE0),
+    gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, 32, 64),
+    gsDPSetTexturePersp(G_TP_NONE),
+    gsDPSetTextureFilter(G_TF_BILERP),
+    gsDPSetRenderMode(G_RM_PASS, G_RM_CLD_SURF2),
+    gsDPSetCombineLERP(0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1),
+    gsSPTextureRectangle(0, 0, 0x0080, 0x0100, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400),
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(TEXEL0, TEXEL1, TEXEL0, TEXEL1, 1, TEXEL0, TEXEL1, 1, 0, 0, 0, COMBINED, COMBINED, TEXEL1, TEXEL1, TEXEL1),
+    gsSPTextureRectangle(0, 0, 0x0080, 0x0100, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400),
+    gsDPPipeSync(),
+    gsDPLoadTextureTile(D_000B3AE0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 0, 0, 0, 31, 63, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPSetColorImage(G_IM_FMT_I, G_IM_SIZ_8b, 32, D_000B32E0),
+    gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2),
+    gsDPSetTextureFilter(G_TF_POINT),
+    gsDPSetCombineLERP(TEXEL1, K4, PRIMITIVE_ALPHA, TEXEL0, TEXEL0, TEXEL1, ENVIRONMENT, ENVIRONMENT, TEXEL1, K4, COMBINED_ALPHA, COMBINED, 0, 0, 0, 1),
+    gsDPSetConvert(0, 0, 0, 0, 92, 0),
+    gsDPSetPrimColor(0, 0, 0x00, 0x00, 0x00, 0x78),
+    gsDPSetEnvColor(0x00, 0x00, 0x00, 0xA4),
+    gsDPLoadMultiTile(D_000B32E0, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 0, 0, 0, 31, 63, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPSetTileSize(1, 0x0004, 0, 0x007C, 0x00FC),
+    gsSPTextureRectangle(0, 0, 0x0080, 0x0100, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400),
+    gsDPPipeSync(),
+    gsDPLoadMultiTile(D_000B32E0, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 0, 0, 0, 31, 63, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPSetTileSize(1, 0x007C, 0, 0x007C, 0x00FC),
+    gsSPTextureRectangle(0, 0, 0x0080, 0x0100, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400),
+    gsDPPipeSync(),
+    gsDPLoadMultiTile(D_000B32E0, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 0, 0, 0, 31, 63, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_CLAMP, 5, 6, G_TX_NOLOD, G_TX_NOLOD),
+    gsDPSetTileSize(1, 0, 0x0004, 0x007C, 0x00FC),
+    gsSPTextureRectangle(0, 0, 0x0080, 0x0100, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400),
+    gsDPPipeSync(),
+    gsSPEndDisplayList(),
+};
--- a/src/os/initialize.c
+++ b/src/os/initialize.c
@ -25,7 +25,9 @@ void* __printfunc = NULL;
 u32 __kmc_pt_mode;
 #endif

-s32 paddingmeowplol[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+s32 D_80095904[3] = { 0 }; // padding?
+s32 D_80095910[10] = { 0 };
+s32 D_80095938[2] = { 0 };

 void __createSpeedParam(void) {
    __Dom1SpeedParam.type = DEVICE_TYPE_INIT;
--- a/src/world/action/hammer.c
+++ b/src/world/action/hammer.c
@ -17,7 +17,9 @@ typedef struct HammerHitData {
    /* 0x1C */ s32 unk_1C;
 } HammerHitData;

-extern HammerHitData* HammerHit;
+BSS HammerHitData D_802B6E90;
+
+HammerHitData* HammerHit = &D_802B6E90;

 void func_802B6820_E256F0(void);

--- a/src/world/area_dro/dro_02/dro_02_5_npc.c
+++ b/src/world/area_dro/dro_02/dro_02_5_npc.c
@ -6,11 +6,11 @@

 #define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo

-static f32 N(D_8024EF80);
-static f32 N(D_8024EF84);
-static s32 N(RitualStateTime);
-static s8 N(pad_D_8024EF8C)[0x4];
-static EffectInstance* N(D_8024EF90)[4];
+BSS f32 N(D_8024EF80);
+BSS f32 N(D_8024EF84);
+BSS s32 N(RitualStateTime);
+BSS s8 N(pad_D_8024EF8C)[0x4];
+BSS EffectInstance* N(D_8024EF90)[4];

 #include "world/common/complete/Quizmo.inc.c"

--- a/src/world/area_hos/hos_04/A274B0.c
+++ b/src/world/area_hos/hos_04/A274B0.c
@ -7,8 +7,9 @@ extern f32 D_80241B7C_A28A4C;
 extern u16* D_80241B80_A28A50;
 extern s32 D_80241B84_A28A54;
 extern s32 D_80241B88_A28A58;
-extern f32 D_80243370;
-extern f32 D_80243374;
+
+BSS f32 D_80243370;
+BSS f32 D_80243374;

 ApiStatus N(SetCamXXVfov)(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_hos/hos_04/A27AA0.c
+++ b/src/world/area_hos/hos_04/A27AA0.c
@ -11,8 +11,7 @@ const char N(exit_str_2)[] = "hos_00";
 const char N(exit_str_3)[] = "osr_03";
 const char N(exit_str_4)[] = "hos_05";

-// BSS
-extern s32 D_80243380;
+BSS s32 D_80243380;

 void func_80240BD0_A27AA0(s32** arg0) {
    u8 type;
--- a/src/world/area_hos/hos_05/A2AAC0.c
+++ b/src/world/area_hos/hos_05/A2AAC0.c
@ -96,19 +96,22 @@ extern f32 D_8024AEC4_A35104;
 extern f32 D_8024AEC8_A35108;

 // BSS?
-extern f32 D_8024F2C8;
-extern f32 D_8024F2CC;
-extern f32 D_8024F2D8;
-extern f32 D_8024F2DC;
-extern f32 D_8024F2E0;
-extern f32 D_8024F2E4;
-extern f32 D_8024F2E8;
-extern f32 D_8024F2EC;
-extern f32 D_8024F2F0_C0CB70;
-extern f32 D_8024F2F4;
-extern f32 D_8024F2F8;
-extern f32 D_8024F374;
-extern f32 D_8024F378;
+BSS f32 D_8024F2C8;
+BSS f32 D_8024F2CC;
+BSS f32 D_8024F2D0; // unused?
+BSS f32 D_8024F2D4; // unused?
+BSS f32 D_8024F2D8;
+BSS f32 D_8024F2DC;
+BSS f32 D_8024F2E0;
+BSS f32 D_8024F2E4;
+BSS f32 D_8024F2E8;
+BSS f32 D_8024F2EC;
+BSS f32 D_8024F2F0;
+BSS f32 D_8024F2F4;
+BSS f32 D_8024F2F8;
+BSS char D_8024F2FC[0x78]; // unused?
+BSS f32 D_8024F374;
+BSS f32 D_8024F378;

 ApiStatus func_80240880_A2AAC0(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -595,13 +598,13 @@ ApiStatus func_802423D4_A2C614(Evt* script, s32 isInitialCall) {
    func_802410E4_A2B324(4, 130.0f, 270.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2E4);
    func_802410E4_A2B324(4, 30.0f, 0.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2E8);
    func_802410E4_A2B324(4, 232.0f, 177.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2EC);
-    func_802410E4_A2B324(4, 0.0f, 0.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2F0_C0CB70);
+    func_802410E4_A2B324(4, 0.0f, 0.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2F0);
    func_80240D54_A2AF94(0, D_8024F2E0);
    camera->panActive = TRUE;
    camera->controlSettings.boomLength = D_8024F2E4;
    camera->movePos.x = D_8024F2E8;
    camera->movePos.y = D_8024F2EC;
-    camera->movePos.z = D_8024F2F0_C0CB70;
+    camera->movePos.z = D_8024F2F0;

    D_80249A80_A33CC0++;
    if (D_80249A80_A33CC0 <= 90) {
--- a/src/world/area_hos/hos_05/A2EF00.c
+++ b/src/world/area_hos/hos_05/A2EF00.c
@ -15,7 +15,7 @@ extern u8 D_802D9D73;

 ApiStatus func_802452C4_A2F504(Evt* script, s32 isInitialCall) {
    Bytecode* args;
-    static char N(bss_padding)[0x2B0]; // TODO remove / relocate this
+    static char N(bss_padding)[0x200]; // TODO remove / relocate this
    static u8 oldPrimR, oldPrimG, oldPrimB;
    static u8 oldEnvR, oldEnvG, oldEnvB;
    static s32 newPrimR, newPrimG, newPrimB;
--- a/src/world/area_hos/hos_06/A397F0.c
+++ b/src/world/area_hos/hos_06/A397F0.c
@ -29,7 +29,7 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 hos_06_D_80246260[];
+BSS s32 hos_06_D_80246260[114];

 ApiStatus func_802406E0_A39BC0(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@ -21,7 +21,7 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80248760_jan_02[];
+BSS s32 D_80248760_jan_02[114];

 ApiStatus func_80241578_B2D9E8(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@ -40,7 +40,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_8024FBA0[];
+BSS s32 D_8024FBA0[114];
+BSS s32 D_8024FD68[92];

 ApiStatus func_80241A64_B36634(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -61,8 +62,6 @@ ApiStatus func_80241A64_B36634(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_8024FD68[];
-
 ApiStatus func_80241B00_B366D0(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_jan/jan_04/B45150.c
+++ b/src/world/area_jan/jan_04/B45150.c
@ -4,7 +4,7 @@
 // #include "world/common/todo/LoadPartyImage.inc.c"
 API_CALLABLE(N(LoadPartyImage)) {
    static PAL_BIN palette[256];
-    static IMG_BIN raster[0x3DA0]; // similar to LoadPartyImage include but with 0x10 bytes added for padding
+    static IMG_BIN raster[0x3DA0]; // similar to LoadPartyImage include but with 0x10 bytes added for padding (look at D_8024A290 - I think this goes in between the two)
    static MessageImageData image;

    u32 decompressedSize;
--- a/src/world/area_kkj/kkj_18/AF2FE0.c
+++ b/src/world/area_kkj/kkj_18/AF2FE0.c
@ -3,7 +3,6 @@

 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
-extern s32 kkj_18_D_80244E78[];

 #include "world/common/todo/GetNpcCollisionHeight.inc.c"

@ -38,7 +37,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 kkj_18_D_80244CB0[];
+BSS s32 kkj_18_D_80244CB0[114];
+BSS s32 kkj_18_D_80244E78[92];

 ApiStatus func_802405F8_AF3298(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_kkj/kkj_19/AF7C00.c
+++ b/src/world/area_kkj/kkj_19/AF7C00.c
@ -1,26 +1,26 @@
 #include "kkj_19.h"
 #include "hud_element.h"
+#include "battle/action_cmd.h"

 extern s32 kkj_19_ItemChoice_HasSelectedItem;
 extern s32 kkj_19_ItemChoice_SelectedItemID;
-extern s32 kkj_19_D_802461F0[];
-extern s32 D_802463B8_kkj_19[];
-extern s32 D_8024652C;
-extern s32 D_80246530;
-extern s32 D_80246534;
-extern s32 D_80246538_kkj_19[];
-extern s32 D_80246550_kkj_19;
-extern s32 D_80246554;
-extern u32 D_80246558_kkj_19;
-extern s32 D_8024655C;
-extern s32 D_80246560_kkj_19;
-extern s32 D_80246568_C8C018[];
-extern s32 D_80246578[];
-extern s32 D_802465A0;
-extern HudScript HES_AButton;
-extern HudScript HES_BlueMeter;
-extern HudScript HES_MashAButton;
-extern s32 dgb_08_npcGroup_80246528;
+
+BSS s32 kkj_19_D_802461F0[114];
+BSS s32 D_802463B8_kkj_19[92];
+BSS s32 kkj_19_D_80246528;
+BSS s32 D_8024652C;
+BSS s32 D_80246530;
+BSS s32 D_80246534;
+BSS s32 D_80246538_kkj_19[6];
+BSS s32 D_80246550_kkj_19;
+BSS s32 D_80246554;
+BSS u32 D_80246558_kkj_19;
+BSS s32 D_8024655C;
+BSS s32 D_80246560_kkj_19;
+BSS s32 D_80246564_kkj_19; // unused?
+BSS s32 D_80246568_C8C018[4];
+BSS s32 D_80246578[10];
+BSS s32 D_802465A0;

 #include "world/common/todo/GetNpcCollisionHeight.inc.c"

@ -113,7 +113,7 @@ ApiStatus func_802406C4_AF8014(Evt* script, s32 isInitialCall) {
        case 0:
            D_80246534 = evt_get_variable(script, *args++);
            D_80246554 = create_worker_frontUI(NULL, func_802406A0_AF7FF0);
-            dgb_08_npcGroup_80246528 = 0;
+            kkj_19_D_80246528 = 0;
            D_80246530 = 0;
            for (i = 0; i < 10; i++) {
                D_80246578[i] = 0;
@ -167,17 +167,17 @@ ApiStatus func_802406C4_AF8014(Evt* script, s32 isInitialCall) {
            break;
        case 10:
            hud_element_set_script(D_80246568_C8C018[0], &HES_MashAButton);
-            dgb_08_npcGroup_80246528 = 0;
+            kkj_19_D_80246528 = 0;
            D_8024652C = 0;
            D_80246558_kkj_19 = 11;
            // fallthrough
        case 11:
            temp = D_80246538_kkj_19[D_80246550_kkj_19];
            if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) {
-                dgb_08_npcGroup_80246528++;
+                kkj_19_D_80246528++;
            }
-            if (dgb_08_npcGroup_80246528 > temp) {
-                dgb_08_npcGroup_80246528 = temp;
+            if (kkj_19_D_80246528 > temp) {
+                kkj_19_D_80246528 = temp;
            }
            if (D_8024652C == 2) {
                D_8024652C = 3;
@ -203,7 +203,7 @@ ApiStatus func_802406C4_AF8014(Evt* script, s32 isInitialCall) {
                D_80246534--;
                break;
            }
-            script->varTable[0] = dgb_08_npcGroup_80246528;
+            script->varTable[0] = kkj_19_D_80246528;
            hud_element_free(D_80246568_C8C018[0]);
            hud_element_free(D_80246568_C8C018[1]);
            free_worker(D_80246554);
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@ -78,7 +78,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 kmr_02_D_80257F58[];
+BSS s32 kmr_02_D_80257F2C[11]; // unused?
+BSS s32 kmr_02_D_80257F58[114];

 ApiStatus func_802422F8_8B2368(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -127,7 +128,8 @@ ApiStatus func_80242710_8B2780(Evt* script, s32 isInitialCall) {

 extern u8 D_80257B00_8C7B70;
 extern u16 D_80257D00_8C7D70;
-extern MessageImageData D_80258120;
+
+BSS MessageImageData D_80258120;

 ApiStatus func_80242734_8B27A4(void) {
    D_80258120.raster = &D_80257B00_8C7B70; // TODO extract image
--- a/src/world/area_kmr/kmr_22/8FF680.c
+++ b/src/world/area_kmr/kmr_22/8FF680.c
@ -2,8 +2,9 @@
 #include "effects.h"

 extern s16 D_80240DE0_900450[];
-extern EffectInstance* D_802483C0;
-extern s32 D_802483C4;
+
+BSS EffectInstance* D_802483C0;
+BSS s32 D_802483C4;

 ApiStatus func_80240010_8FF680(Evt* script, s32 isInitialCall) {
    s32 var_s0 = script->varTable[0];
--- a/src/world/area_kmr/kmr_22/8FF8B0.c
+++ b/src/world/area_kmr/kmr_22/8FF8B0.c
@ -24,7 +24,7 @@ enum {

 extern s32 N(VineAnimationsDmaTable)[];
 extern Gfx N(lava_piranha_vine_gfx)[];
-extern s32 N(VineRenderState);
+BSS s32 N(VineRenderState);

 void N(make_vine_interpolation)(LavaPiranhaVine* vine) {
    Evt dummyEvt;
--- a/src/world/area_kpa/kpa_81/A78510.c
+++ b/src/world/area_kpa/kpa_81/A78510.c
@ -47,7 +47,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
 }
 #endif

-extern s32 kpa_81_D_80242040[];
+BSS s32 kpa_81_D_80242040[114];
+BSS s32 D_80242208[92];

 ApiStatus func_80240308_A787C8(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -68,8 +69,6 @@ ApiStatus func_80240308_A787C8(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80242208[];
-
 ApiStatus func_802403A4_A78864(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_kpa/kpa_82/A7A550.c
+++ b/src/world/area_kpa/kpa_82/A7A550.c
@ -17,7 +17,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80248F90[];
+BSS s32 D_80248F90[114];
+BSS s32 D_80249158[92];

 ApiStatus func_80240308_A7A808(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -38,8 +39,6 @@ ApiStatus func_80240308_A7A808(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80249158[];
-
 ApiStatus func_802403A4_A7A8A4(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c
+++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c
@ -73,7 +73,7 @@ s32 N(VineAnimationsDmaTable)[] = {
    PIRANHA_DMA_ENTRY(24),
 };

-static s32 N(VineRenderState);
+BSS s32 N(VineRenderState);

 MAP_STATIC_PAD(1, unk_static_pad);

--- a/src/world/area_mac/mac_01/mac_01_9_npc.c
+++ b/src/world/area_mac/mac_01/mac_01_9_npc.c
@ -2,14 +2,15 @@
 #include "effects.h"
 #include "hud_element.h"

-extern s32 D_80262F68;
-extern PopupMenu D_80262C38;
 extern IconHudScriptPair gItemHudScripts[];
 extern EvtScript N(EVS_ToadHouse_GetInBed);
 extern EvtScript N(EVS_ToadHouse_SetDialogue);
 extern EvtScript N(EVS_ToadHouse_ReturnFromRest);
 extern EvtScript N(EVS_MerlonBargeOut);

+extern PopupMenu D_80262C38;
+extern s32 D_80262F68;
+
 #include "world/common/npc/Toad_Wander.inc.c"
 #include "world/common/npc/Toad_Patrol.inc.c"
 #include "world/common/npc/Toad_Stationary.inc.c"
@ -77,7 +78,7 @@ EvtScript N(EVS_LetterReward_Merlon) = {

 s32 N(LetterList_MinhT)[] = {
    ITEM_LETTER_TO_MINHT,
-    ITEM_NONE 
+    ITEM_NONE
 };

 EvtScript N(EVS_LetterPrompt_MinhT) = {
@ -101,7 +102,7 @@ EvtScript N(EVS_LetterReward_MinhT) = {

 s32 N(LetterList_Kolorado)[] = {
    ITEM_LETTER25,
-    ITEM_NONE 
+    ITEM_NONE
 };

 EvtScript N(EVS_LetterPrompt_Kolorado) = {
@ -125,7 +126,7 @@ EvtScript N(EVS_LetterReward_Kolorado) = {

 s32 N(ItemList_Artifact)[] = {
    ITEM_ARTIFACT,
-    ITEM_NONE 
+    ITEM_NONE
 };

 EvtScript N(EVS_ArtifactReward_Kolorado) = {
--- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c
+++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c
@ -30,7 +30,8 @@ extern s32 N(InitialConfigurations)[3][NUM_BOXES];
 extern s32 N(BoxModelIDs)[NUM_BOXES];
 extern s32 N(BoxColliderIDs)[NUM_BOXES];
 extern s32 N(PanelModelIDs)[NUM_PANELS];
-extern s32 D_80248600[NUM_PANELS]; //TODO set name: PanelModelsAssigned
+
+BSS s32 D_80248600[NUM_PANELS]; //TODO set name: PanelModelsAssigned

 extern IMG_BIN N(panel_peach_img);
 extern PAL_BIN N(panel_peach_pal);
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@ -53,7 +53,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 nok_01_D_80251C70[];
+BSS s32 nok_01_D_80251C40[12]; // unused?
+BSS s32 nok_01_D_80251C70[114];

 ApiStatus func_802420B4_9C7494(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_nok/nok_02/9D7020.c
+++ b/src/world/area_nok/nok_02/9D7020.c
@ -27,7 +27,7 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 nok_02_D_802547D0[];
+BSS s32 nok_02_D_802547D0[114];

 ApiStatus func_802406B0_9D76D0(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@ -34,7 +34,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
 }
 #define NAMESPACE nok_02

-extern s32 nok_02_D_802549D0[];
+BSS s32 nok_02_D_802549A0[12]; // unused?
+BSS s32 nok_02_D_802549D0[114];

 ApiStatus func_80242C5C_9D9C7C(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_nok/nok_02/9DA8F0.c
+++ b/src/world/area_nok/nok_02/9DA8F0.c
@ -48,7 +48,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
 }
 #define NAMESPACE nok_02

-extern s32 nok_02_D_80254BA0[];
+BSS s32 nok_02_D_80254BA0[114];
+BSS s32 nok_02_D_80254D68[92];

 ApiStatus func_80243C78_9DAC98(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -69,8 +70,6 @@ ApiStatus func_80243C78_9DAC98(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 nok_02_D_80254D68[];
-
 ApiStatus func_80243D14_9DAD34(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_obk/obk_01/BBD980.c
+++ b/src/world/area_obk/obk_01/BBD980.c
@ -21,7 +21,7 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 obk_01_802458F0[];
+BSS s32 obk_01_802458F0[114];

 ApiStatus func_80240BB0_BBDD50(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_obk/obk_03/BC43F0.c
+++ b/src/world/area_obk/obk_03/BC43F0.c
@ -21,7 +21,7 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80243BE0[];
+BSS s32 D_80243BE0[114];

 ApiStatus func_80240540_BC47C0(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_omo/omo_05/DB22C0.c
+++ b/src/world/area_omo/omo_05/DB22C0.c
@ -26,8 +26,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80245650[];
-extern s32 D_802457C0[];
+BSS s32 D_80245650[92];
+BSS s32 D_802457C0[92];

 ApiStatus func_80242204_DB44C4(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_omo/omo_13/DE2710.c
+++ b/src/world/area_omo/omo_13/DE2710.c
@ -41,7 +41,7 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 omo_13_80243220[];
+BSS s32 omo_13_80243220[92];

 ApiStatus func_80240F8C_DE341C(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_osr/osr_01/AB0350.c
+++ b/src/world/area_osr/osr_01/AB0350.c
@ -52,7 +52,7 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
 }
 #endif

-extern s32 osr_01_D_80242180[];
+BSS s32 osr_01_D_80242180[114];

 ApiStatus func_80240730_AB0720(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
--- a/src/world/area_pra/pra_01/D4D060.c
+++ b/src/world/area_pra/pra_01/D4D060.c
@ -26,7 +26,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80242FB0[];
+BSS s32 D_80242FB0[114];
+BSS s32 pra_01_80243178[92];

 ApiStatus func_80241238_D4E278(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -47,8 +48,6 @@ ApiStatus func_80241238_D4E278(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 pra_01_80243178[];
-
 ApiStatus func_802412D4_D4E314(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_pra/pra_02/D50010.c
+++ b/src/world/area_pra/pra_02/D50010.c
@ -19,7 +19,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 pra_02_D_80243CC0[];
+BSS s32 pra_02_D_80243CC0[114];
+BSS s32 pra_02_80243E88[92];

 ApiStatus func_802411D8_D511C8(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -40,8 +41,6 @@ ApiStatus func_802411D8_D511C8(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 pra_02_80243E88[];
-
 ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_pra/pra_09/D588B0.c
+++ b/src/world/area_pra/pra_09/D588B0.c
@ -20,7 +20,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 flo_18_shakeTree[];
+BSS s32 pra_09_80246A20[114];
+BSS s32 D_80246BE8[92];

 ApiStatus func_802411D8_D59A68(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -29,20 +30,18 @@ ApiStatus func_802411D8_D59A68(Evt* script, s32 isInitialCall) {

    if (ptr != NULL) {
        for (i = 0; ptr[i] != 0; i++) {
-            flo_18_shakeTree[i] = ptr[i];
+            pra_09_80246A20[i] = ptr[i];
        }
-        flo_18_shakeTree[i] = 0;
+        pra_09_80246A20[i] = 0;
    } else {
        for (i = 0; i < 112; i++) {
-            flo_18_shakeTree[i] = i + 16;
-            flo_18_shakeTree[112] = 0;
+            pra_09_80246A20[i] = i + 16;
+            pra_09_80246A20[112] = 0;
        }
    }
    return ApiStatus_DONE2;
 }

-extern s32 D_80246BE8[];
-
 ApiStatus func_80241274_D59B04(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_pra/pra_13/D64600.c
+++ b/src/world/area_pra/pra_13/D64600.c
@ -19,7 +19,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80243720[];
+BSS s32 D_80243720[114];
+BSS s32 pra_13_802438E8[92];

 ApiStatus func_802411D8_D657B8(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -40,8 +41,6 @@ ApiStatus func_802411D8_D657B8(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 pra_13_802438E8[];
-
 ApiStatus func_80241274_D65854(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ b/src/world/area_pra/pra_19/D6E9D0.c
@ -19,7 +19,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_802479F0[];
+BSS s32 D_802479F0[114];
+BSS s32 D_80247BB8_pra_19[92];

 ApiStatus func_802411D8_D6FB88(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -40,8 +41,6 @@ ApiStatus func_802411D8_D6FB88(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80247BB8_pra_19[];
-
 ApiStatus func_80241274_D6FC24(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_pra/pra_31/D7ED80.c
+++ b/src/world/area_pra/pra_31/D7ED80.c
@ -17,7 +17,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80247CA0[];
+BSS s32 D_80247CA0[114];
+BSS s32 D_80247E68[92];

 ApiStatus func_802402D8_D7F038(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -38,8 +39,6 @@ ApiStatus func_802402D8_D7F038(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_80247E68[];
-
 ApiStatus func_80240374_D7F0D4(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@ -20,7 +20,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_8024DBC0[];
+BSS s32 D_8024DBC0[114];
+BSS s32 D_8024DD88[92];

 ApiStatus func_802405C8_CF8138(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -41,8 +42,6 @@ ApiStatus func_802405C8_CF8138(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_8024DD88[];
-
 ApiStatus func_80240664_CF81D4(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_sam/sam_04/D138E0.c
+++ b/src/world/area_sam/sam_04/D138E0.c
@ -17,7 +17,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 sam_04_80245210[];
+BSS s32 sam_04_80245210[114];
+BSS s32 D_802453D8[92];

 ApiStatus func_802405C8_D13B98(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -38,8 +39,6 @@ ApiStatus func_802405C8_D13B98(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_802453D8[];
-
 ApiStatus func_80240664_D13C34(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@ -24,7 +24,8 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_8024BEA0[];
+BSS s32 D_8024BEA0[114];
+BSS s32 D_8024C068[92];

 ApiStatus func_80241E18_D21CA8(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
@ -45,8 +46,6 @@ ApiStatus func_80241E18_D21CA8(Evt* script, s32 isInitialCall) {
    return ApiStatus_DONE2;
 }

-extern s32 D_8024C068[];
-
 ApiStatus func_80241EB4_D21D44(Evt* script, s32 isInitialCall) {
    Bytecode* args = script->ptrReadPos;
    s32* ptr = (s32*) evt_get_variable(script, *args++);
--- a/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c
+++ b/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c
@ -13,12 +13,11 @@ s32 N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) {
    #endif
    Npc* npc = get_npc_unsafe(enemy->npcID);
    Bytecode* args = script->ptrReadPos;
+    EnemyDetectVolume territory;
    #ifdef _DEAD_H_
    MobileAISettings* npcAISettings = (MobileAISettings*)evt_get_variable(script, *args++);
-    EnemyDetectVolume territory;
    EnemyDetectVolume* territoryPtr = &territory;
    #else
-    EnemyDetectVolume territory;
    EnemyDetectVolume* territoryPtr = &territory;
    MobileAISettings* npcAISettings = (MobileAISettings*)evt_get_variable(script, *args++);
    #endif
--- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
+++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
@ -96,7 +96,7 @@ s32 N(VineAnimationsDmaTable)[] = {
    PIRANHA_DMA_ENTRY(24),
 };

-static s32 N(VineRenderState);
+BSS s32 N(VineRenderState);

 MAP_STATIC_PAD(1, unk_static_pad);

--- a/tools/ignored_funcs.txt
+++ b/tools/ignored_funcs.txt
@ -249,7 +249,6 @@ dead_BindNpcAux = 0x80048F68;
 dead_GetNpcPos = 0x802DC654;
 dead_func_802CF56C = 0x802DCACC;
 dead_dma_copy = 0x8002AA2C;
-func_80059AC8 = 0x80059AC8;
 dead_get_entity_by_index = 0x80118BB0;
 dead_cos_rad = 0x8002B4C0;
 dead_fx_sun = 0x80077BD0;
@ -282,7 +281,7 @@ dead_npc_test_move_simple_without_slipping = 0x800E53AC;
 dead_get_item_entity = 0x8013CF98;
 dead_get_current_map_settings = 0x8005F128;
 dead_partner_clear_player_tracking = 0x800F7278;
-func_800F2E98 = 0x800F2E98;
+dead_func_800EB2A4 = 0x800F2E98;
 dead_set_npc_yaw = 0x8003ED50;
 dead_disable_npc_shadow = 0x8003E5E8;
 dead_get_screen_coords = 0x8002FCBC;
@ -292,8 +291,5 @@ dead_load_asset_by_name = 0x8005F238;
 dead_decode_yay0 = 0x80074070;
 dead_general_heap_free = 0x8002BF68;
 dead_set_message_images = 0x80130C64;
-func_8002B45C = 0x8002B45C;
-func_801266F8 = 0x801266F8;
-func_80126734 = 0x80126734;
 dead_set_screen_overlay_params_back = 0x80144194;
 dead_fx_motion_blur_flame = 0x80076970;
--- a/ver/us/asm/data/world/action/hammer.data.s
+++ b/ver/us/asm/data/world/action/hammer.data.s
@ -1,6 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel HammerHit
-.word D_802B6E90_E2A300, 0x00000000, 0x00000000, 0x00000000
--- a/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s
@ -12,7 +12,7 @@ dlabel kpa_81_ItemChoice_SelectedItemID
 .word 0x00000000

 dlabel D_80240DA0_A79260
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A787C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DA0_A79260, 0x00000010, 0x00000000, func_80242040_8B20B0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A787C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DA0_A79260, 0x00000010, 0x00000000, kpa_81_D_80242040, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

 dlabel D_80240F34_A793F4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A78864, 0xFE363C80, 0x0000004E, 0x00000006, D_80240F34_A793F4, 0x00000010, 0x00000000, D_80242208, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
--- a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
@ -39,7 +39,7 @@ dlabel pra_09_ItemChoice_SelectedItemID
 .word 0x00000000

 dlabel D_80241DA0_D5A630
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, flo_18_shakeTree, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, pra_09_80246A20, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

 dlabel D_80241F34_D5A7C4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D59B04, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F34_D5A7C4, 0x00000010, 0x00000000, D_80246BE8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
--- a/ver/us/asm/os/exceptasm.s
+++ b/ver/us/asm/os/exceptasm.s
@ -15,7 +15,7 @@ dlabel jtbl_80099DA0

 .section .text, "ax"

-glabel func_8006A9F0
+glabel __osExceptionPreamble
 /* 45DF0 8006A9F0 3C1A8007 */  lui       $k0, %hi(osExceptionPreamble)
 /* 45DF4 8006A9F4 275AAA00 */  addiu     $k0, $k0, %lo(osExceptionPreamble)
 /* 45DF8 8006A9F8 03400008 */  jr        $k0
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@ -3475,7 +3475,27 @@ segments:
    subsegments:
    - [0x353300, c, flame]
    - [0x353B40]
-  - [0x353BB0, bin] # flame gfx
+  - name: effect_gfx_flame
+    dir: effects/gfx
+    type: code
+    start: 0x353BB0
+    vram: 0x09000000
+    symbol_name_format: $VRAM_$ROM
+    subsegments:
+    - [0x353BB0, c, flame]
+    - start: 0x353BB0
+      type: .data
+      name: flame
+      subsegments:
+      - [0x353BB0, i4, D_09000000_353BB0, 32, 32]
+      - [0x353DB0, i4, D_09000200_353DB0, 32, 32]
+      - [0x353FB0, i4, D_09000400_353FB0, 32, 32]
+      - [0x3541B0, i4, D_09000600_3541B0, 32, 32]
+      - [0x3543B0, gfx, D_09000800_3543B0]
+      - [0x354468, vtx, D_090008B8_354468]
+      - [0x3544A8, gfx, D_090008F8_3544A8]
+      - [0x3544C8, gfx, D_09000918_3544C8]
+      - [0x354590, gfx, D_090009E0_354590]
  - name: effect_stars_burst
    dir: effects
    type: code
@ -14597,8 +14617,7 @@ segments:
    vram: 0x802B6000
    subsegments:
    - [0xE24ED0, c, hammer]
-    - [0xE25C80, data, hammer]
-    - [0xE25C90]
+    - [0xE25C80]
  - type: code
    name: world_action_spin
    dir: world/action
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@ -1070,7 +1070,7 @@ osAfterPreNMI = 0x8006A630; // type:func rom:0x45A30
 __createSpeedParam = 0x8006A650; // type:func rom:0x45A50
 __osInitialize_common = 0x8006A708; // type:func rom:0x45B08
 __osInitialize_autodetect = 0x8006A9E0; // type:func rom:0x45DE0
-func_8006A9F0 = 0x8006A9F0; // type:func rom:0x45DF0
+__osExceptionPreamble = 0x8006A9F0; // type:func rom:0x45DF0
 osExceptionPreamble = 0x8006AA00; // type:label rom:0x45E00
 func_8006AA34 = 0x8006AA34; // type:func rom:0x45E34
 send_mesg = 0x8006AF7C; // rom:0x4637C !
@ -21678,7 +21678,7 @@ dgb_08_npcGroup_80246020 = 0x80246020; // type:data rom:0xC45DD0
 dgb_08_idle_80246210 = 0x80246210; // type:data rom:0xC45FC0
 dgb_08_interact_80246310 = 0x80246310; // type:data rom:0xC460C0
 dgb_08_init_802464C4 = 0x802464C4; // type:data rom:0xC46274
-dgb_08_npcGroup_80246528 = 0x80246528; // type:data rom:0xC462D8
+kkj_19_D_80246528 = 0x80246528; // type:data rom:0xC462D8
 dgb_08_idle_80246718 = 0x80246718; // type:data rom:0xC464C8
 dgb_08_init_80246728 = 0x80246728; // type:data rom:0xC464D8
 dgb_08_npcGroup_80246768 = 0x80246768; // type:data rom:0xC46518
@ -23346,7 +23346,7 @@ flo_18_init_80245C78 = 0x80245C78; // type:data rom:0xCE2318
 flo_18_npcGroup_80245CEC = 0x80245CEC; // type:data rom:0xCE238C
 flo_18_npcGroupList_8024669C = 0x8024669C; // type:data rom:0xCE2D3C
 flo_18_searchBush = 0x802466C0; // type:data rom:0xCE2D60
-flo_18_shakeTree = 0x80246A20; // type:data rom:0xCE30C0
+pra_09_80246A20 = 0x80246A20; // type:data rom:0xCE30C0
 flo_18_80247024 = 0x80247024; // type:data rom:0xCE36C4
 flo_19_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCE36F0
 flo_19_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xCE3814
@ -25882,11 +25882,9 @@ nuScPreNMIFlag = 0x8009A5B0; // type:data
 D_8009BB30 = 0x8009BB30; // type:data
 D_8009C4E0 = 0x8009C4E0; // type:data
 D_8009C4FC = 0x8009C4FC; // type:data
-D_800A08C0 = 0x800A08C0; // type:data
 dead_gCurrentCamID = 0x800A158C; // type:data
 D_800A15A4 = 0x800A15A4; // type:data
 dead_gOverrideFlags = 0x800A15A8; // type:data
-D_800A15C4 = 0x800A15C4; // type:data
 piEventQueue = 0x800AF890; // type:data
 __osFlashID = 0x800B0C30; // type:data
 __osFlashMsg = 0x800B0C40; // type:data
@ -25896,7 +25894,6 @@ __osFlashMsgBuf = 0x800B0CE4; // type:data
 __osFlashVersion = 0x800B0CE8; // type:data
 dead_gCurrentEncounter = 0x800B7EF0; // type:data
 dead_gCameras = 0x800B8D80; // type:data
-D_800B8DEC = 0x800B8DEC; // type:data
 _use_partner_ability = 0x800EA6CC; // type:func
 dead_gPlayerStatusPtr = 0x800FFC90; // type:data
 dead_wPartnerHudScripts = 0x80100060; // type:data
@ -26385,7 +26382,6 @@ D_80247D00 = 0x80247D00; // type:data
 flo_13_D_80247D00 = 0x80247D00; // type:data
 D_80247DF0 = 0x80247DF0; // type:data
 D_80247E68 = 0x80247E68; // type:data
-D_80248380 = 0x80248380; // type:data
 kzn_19_VineRenderState = 0x80248380; // type:data
 dead_kzn_19_D_80248388 = 0x80248388; // type:data
 D_802483C0 = 0x802483C0; // type:data
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@ -1,11 +1,3 @@
-
-// fake?
-D_E7000008 = 0xE7000008;
-D_E8000008 = 0xE8000008;
-D_F0000008 = 0xF0000008;
-D_F5000007 = 0xF5000007;
-D_FD100008 = 0xFD100008;
-
 // Obfuscation symbols
 obfuscated_battle_heap_create = battle_heap_create - 0xFEFFFFF;
 obfuscated_general_heap_create = general_heap_create - 0xFEFEFEF;
@ -15,10 +7,8 @@ D_7599F6D8 = 0x7599F6D8;
 D_F79DDD0F = 0xF79DDD0F;

 // effect_flame
-D_09000800 = 0x09000800;
-D_090008F8 = 0x090008F8;
-D_09000918 = 0x09000918;
-D_090009E0 = 0x090009E0;
+D_000B32E0 = 0x000B32E0; // todo look into
+D_000B3AE0 = 0x000B3AE0; // todo look into

 // effect_quizmo_stage
 D_09000218 = 0x09000218;
@ -57,175 +47,73 @@ D_09001B80 = 0x09001B80;
 // hacks for various things
 fx_sun_undeclared = fx_sun;
 EntityModel_Spring_ReboundAnim = 0x1E4;
-
+D_802AD673 = 0x802AD673; // remove when func_802A45D8 is decompiled with D_802AD670 instead of D_802AD673
 D_E007EC2F = 0xE007EC2F;

-// misc unsorted
-osTvType = 0x80000300;
-osRomBase = 0x80000308;
-osMemSize = 0x80000318;
-gBackgroundImage = 0x80200000;
-D_80200000 = 0x80200000;
-osResetType = 0x8000030C;
-osAppNMIBuffer = 0x8000031C;
-D_800A08C0 = 0x800A08C0;
-D_802457C0 = 0x802457C0;
-mac_02_D_8024E8A8 = 0x8024E8A8;
-
-// effect tlb stuff
-D_80197000 = 0x80197000;
-D_801A6000 = 0x801A6000;
-
-// heap stuff
+// hard-coded heapy things
+D_80197000 = 0x80197000; // effect tlb stuff
+D_801A6000 = 0x801A6000; // effect tlb stuff
 D_801A7000 = 0x801A7000;
 AuHeapBase = 0x801AA000;
+D_80200000 = 0x80200000;
+gBackgroundImage = 0x80200000;
+D_80210000 = 0x80210000;
 heap_collisionHead = 0x80268000;
+mdl_clearRenderTasks = 0x802B7E00; // is this hard-coded?
+D_802EF0D0 = 0x802EF0D0; // is this hard-coded?
 heap_generalHead = 0x802FB800;
 gSpriteHeapPtr = 0x8034F800;
-heap_battleHead = 0x803DA800;
 D_8038F800 = 0x8038F800;
 D_803B5000 = 0x803B5000;
+heap_battleHead = 0x803DA800;

-D_80210000 = 0x80210000;
-
-func_80242040_8B20B0 = 0x80242040;
-D_802AB513 = 0x802AB513;
-
-D_80246568_C8C018 = 0x80246568;
-sam_02_Quizmo_AnswerResult = 0x8024B9A8;
-sam_02_Quizmo_StageEffect = 0x8024B9B0;
-pra_13_802438E8 = 0x802438E8;
-D_802EF0D0 = 0x802EF0D0;
-
-b_area_kzn2_VineData = 0x8022ADD0;
-b_area_kzn2_VineRenderState = 0x8022B550;
-D_80232C4C = 0x80232C4C;
-D_80235E00 = 0x80235E00;
-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_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_80242180 = 0x80242180;
-D_80242208 = 0x80242208;
-D_80242344 = 0x80242344;
-D_802423B0 = 0x802423B0;
-D_802429BC = 0x802429BC;
+// misc map BSS
 D_80242A00 = 0x80242A00;
-flo_12_D_802429E0 = 0x802429E0;
 D_80242C00 = 0x80242C00;
-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_802440E4 = 0x802440E4;
-D_802440E5 = 0x802440E5;
-D_802440E8 = 0x802440E8;
-D_802440EB = 0x802440EB;
-D_802440EC = 0x802440EC;
-D_802440EF = 0x802440EF;
-D_802440F0 = 0x802440F0;
-D_802440F3 = 0x802440F3;
-D_802440F4 = 0x802440F4;
-D_802440F7 = 0x802440F7;
-D_802440F8 = 0x802440F8;
-D_802440FB = 0x802440FB;
-D_802440FC = 0x802440FC;
-D_802440FF = 0x802440FF;
-D_80244100 = 0x80244100;
-D_80244104 = 0x80244104;
-D_802447C0 = 0x802447C0;
-D_80244A20 = 0x80244A20;
-sbk_30_D_80244C18 = 0x80244C18;
-D_80244D88 = 0x80244D88;
-kkj_18_D_80244E78 = 0x80244E78;
-D_802451F0 = 0x802451F0;
-D_80245230 = 0x80245230;
-D_802453D8 = 0x802453D8;
-D_80245430 = 0x80245430;
-D_80245600 = 0x80245600;
-D_80245601 = 0x80245601;
-D_80245602 = 0x80245602;
-D_80245603 = 0x80245603;
-D_80245604 = 0x80245604;
-D_80245605 = 0x80245605;
-D_80245608 = 0x80245608;
-D_8024560C = 0x8024560C;
-D_80245610 = 0x80245610;
-D_80245614 = 0x80245614;
-D_80245618 = 0x80245618;
-D_8024561C = 0x8024561C;
-D_80245620 = 0x80245620;
-sbk_02_D_80245630 = 0x80245630;
-D_80245650 = 0x80245650;
-D_80245928 = 0x80245928;
-D_8024592C = 0x8024592C;
-D_802459C0 = 0x802459C0;
-D_80245AB4 = 0x80245AB4;
-kkj_19_D_802461F0 = 0x802461F0;
-hos_06_D_80246260 = 0x80246260;
-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_80246794 = 0x80246794;
+D_80246990 = 0x80246990;
+osr_00_802437C0 = 0x802437C0;
+D_80247548 = 0x80247548;
+D_80247750 = 0x80247750;
+D_8024A290 = 0x8024A290;
+D_8024F300 = 0x8024F300;
+D_8024F304 = 0x8024F304;
+D_8024F308 = 0x8024F308;
+D_8024F30C = 0x8024F30C;
+D_8024F318 = 0x8024F318;
+D_8024F338 = 0x8024F338;
+D_8024F358 = 0x8024F358;
+D_8024F380 = 0x8024F380;
+D_8024F3F8 = 0x8024F3F8;
+D_8024F448 = 0x8024F448;
+D_8024F498 = 0x8024F498;
+D_8024F4E8 = 0x8024F4E8;
+D_8024F570 = 0x8024F570;
+D_80253060 = 0x80253060;
+D_80253378 = 0x80253378;
+D_80253384 = 0x80253384;
+D_8025338C = 0x8025338C;
+D_80253390 = 0x80253390;
+D_80257118 = 0x80257118;
+D_80257320 = 0x80257320;
+D_80257F20 = 0x80257F20;
+D_80257F21 = 0x80257F21;
+D_80257F22 = 0x80257F22;
+D_80257F23 = 0x80257F23;
+D_80258140 = 0x80258140;
+D_80258340 = 0x80258340;
+D_8025B0A8 = 0x8025B0A8;
+D_8025B2A8 = 0x8025B2A8;
+D_8025B2AC = 0x8025B2AC;
+D_8025B2B0 = 0x8025B2B0;
+D_8025C0D0 = 0x8025C0D0;
+D_80262C38 = 0x80262C38;
+D_80262F68 = 0x80262F68;
+D_8024F470_hos_bss = 0x8024F470;
+
+// Letter delivery BSS
+mac_05_LetterDelivery_SavedNpcAnim = 0x80252D38;
+mac_00_LetterDelivery_SavedNpcAnim = 0x80255ED8;
+dup_mac_00_LetterDelivery_SavedNpcAnim = 0x802560A4;
 kmr_02_LetterDelivery_SavedNpcAnim = 0x8025811C;
 osr_01_LetterDelivery_SavedNpcAnim = 0x80242344;
 hos_06_LetterDelivery_SavedNpcAnim = 0x80246424;
@ -239,299 +127,72 @@ sbk_30_LetterDelivery_SavedNpcAnim = 0x80244D88;
 sbk_34_LetterDelivery_SavedNpcAnim = 0x802429A4;
 obk_01_LetterDelivery_SavedNpcAnim = 0x80245AB4;
 obk_03_LetterDelivery_SavedNpcAnim = 0x80243DA4;
-D_80243370 = 0x80243370;
-D_80246990 = 0x80246990;
-D_80246BE8 = 0x80246BE8;
-D_80247050 = 0x80247050;
-D_80247BB8_pra_19 = 0x80247BB8;
-pra_01_80243178 = 0x80243178;
-D_80246538_kkj_19 = 0x80246538;
-D_80246550_kkj_19 = 0x80246550;
-D_80246558_kkj_19 = 0x80246558;
-D_80246560_kkj_19 = 0x80246560;
-D_802463B8_kkj_19 = 0x802463B8;
-D_80243390_omo_12 = 0x80243390;
-osr_00_802437C0 = 0x802437C0;
-sam_04_80245210 = 0x80245210;
-D_80243380 = 0x80243380;
-obk_01_802458F0 = 0x802458F0;
-omo_13_80243220 = 0x80243220;
-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_80247E68 = 0x80247E68;
-D_802483C0 = 0x802483C0;
-D_802483C4 = 0x802483C4;
-kmr_22_VineRenderState = 0x802483D0;
-iwa_10_D_80248480 = 0x80248480;
-D_80248600 = 0x80248600;
-D_80248624 = 0x80248624;
-D_80248650 = 0x80248650;
-D_80248850 = 0x80248850;
+
+// Quizmo BSS
+sam_02_Quizmo_AnswerResult = 0x8024B9A8;
+sam_02_Quizmo_StageEffect = 0x8024B9B0;
 jan_02_Quizmo_Worker = 0x80248924;
 jan_02_Quizmo_AnswerResult = 0x80248938;
 jan_02_Quizmo_StageEffect = 0x80248940;
 jan_02_Quizmo_AudienceEffect = 0x80248944;
 jan_02_Quizmo_VannaTEffect = 0x80248948;
-D_80248760_jan_02 = 0x80248760;
-D_80248F90 = 0x80248F90;
-D_80249158 = 0x80249158;
-end_01_CreditsData = 0x80249440;
-D_8024A290 = 0x8024A290;
-D_8024A2A0 = 0x8024A2A0;
-D_8024A2C4 = 0x8024A2C4;
-end_01_CreditsMessageBuffers = 0x8024A2D0;
 sam_01_Quizmo_Worker = 0x8024DEF8;
 sam_02_Quizmo_Worker = 0x8024B990;
 sam_02_Quizmo_AudienceEffect = 0x8024B9B4;
 sam_02_Quizmo_VannaTEffect = 0x8024B9B8;
-D_8024BA90 = 0x8024BA90;
 hos_03_Quizmo_Worker = 0x8024BDD0;
 hos_03_Quizmo_AnswerResult = 0x8024BDE8;
 hos_03_Quizmo_StageEffect = 0x8024BDF0;
 hos_03_Quizmo_AudienceEffect = 0x8024BDF4;
 hos_03_Quizmo_VannaTEffect = 0x8024BDF8;
-D_8024BEA0 = 0x8024BEA0;
-D_8024C068 = 0x8024C068;
-D_8024C088 = 0x8024C088;
-D_8024C110 = 0x8024C110;
-D_8024C1D8 = 0x8024C1D8;
-D_8024C5E0 = 0x8024C5E0;
-D_8024DBC0 = 0x8024DBC0;
-D_8024DD88 = 0x8024DD88;
 sam_01_Quizmo_AnswerResult = 0x8024DF10;
 sam_01_Quizmo_StageEffect = 0x8024DF18;
 sam_01_Quizmo_AudienceEffect = 0x8024DF1C;
 sam_01_Quizmo_VannaTEffect = 0x8024DF20;
-D_8024DF24 = 0x8024DF24;
-D_8024DFC0 = 0x8024DFC0;
-D_8024DFD8 = 0x8024DFD8;
-D_8024DFE0 = 0x8024DFE0;
-D_8024DFE4 = 0x8024DFE4;
-D_8024DFE8 = 0x8024DFE8;
-D_8024E1B4 = 0x8024E1B4;
-mac_02_Quizmo_Worker = 0x8024E540;
-mac_02_Quizmo_AnswerResult = 0x8024E558;
-mac_02_Quizmo_StageEffect = 0x8024E560;
-mac_02_Quizmo_AudienceEffect = 0x8024E564;
-mac_02_Quizmo_VannaTEffect = 0x8024E568;
-mac_02_D_8024E570 = 0x8024E570;
-mac_02_D_8024E738 = 0x8024E738;
-end_00_CreditsData = 0x8024E960;
-sbk_30_D_80244A50 = 0x80244A50;
-kkj_18_D_80244CB0 = 0x80244CB0;
-D_8024EA10 = 0x8024EA10;
-D_8024EA14 = 0x8024EA14;
-mac_02_LetterDelivery_SavedNpcAnim = 0x8024EA18;
-D_8024EF84 = 0x8024EF84;
-D_8024EF90 = 0x8024EF90;
-D_8024EFB8 = 0x8024EFB8;
-D_8024EFC0 = 0x8024EFC0;
-D_8024EFC8 = 0x8024EFC8;
-D_8024EFCC = 0x8024EFCC;
-D_8024F010 = 0x8024F010;
-dro_02_KeyItemChoiceList = 0x8024F080;
-ItemChoiceList = 0x8024F248;
-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_8024F2C0 = 0x8024F2C0;
-D_8024F2C4 = 0x8024F2C4;
-D_8024F2C8 = 0x8024F2C8;
-D_8024F2CC = 0x8024F2CC;
-D_8024F2D8 = 0x8024F2D8;
-D_8024F2DC = 0x8024F2DC;
-D_8024F2E0 = 0x8024F2E0;
-D_8024F2E4 = 0x8024F2E4;
-D_8024F2E8 = 0x8024F2E8;
-D_8024F2EC = 0x8024F2EC;
-D_8024F2F4 = 0x8024F2F4;
-D_8024F2F8 = 0x8024F2F8;
-D_8024F2FC = 0x8024F2FC;
-D_8024F300 = 0x8024F300;
-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_8024F380 = 0x8024F380;
-D_8024F3F8 = 0x8024F3F8;
-D_8024F448 = 0x8024F448;
-D_8024F498 = 0x8024F498;
-D_8024F4E8 = 0x8024F4E8;
-D_8024F570 = 0x8024F570;
-mac_04_Quizmo_StageEffect = 0x8024F5C0;
-mac_04_Quizmo_Worker = 0x8024F5A0;
-mac_04_Quizmo_AnswerResult = 0x8024F5B8; // type:data
-mac_04_Quizmo_AudienceEffect = 0x8024F5C4;
-mac_04_Quizmo_VannaTEffect = 0x8024F5C8;
-mac_04_D_8024F5D0 = 0x8024F5D0;
-end_00_CreditsDataPtr = 0x8024F7E4;
-end_00_CreditsMessageBuffers = 0x8024F7F0;
-D_8024FBA0 = 0x8024FBA0;
-D_8024FD68 = 0x8024FD68;
 jan_03_Quizmo_Worker = 0x8024FED8;
 jan_03_Quizmo_AnswerResult = 0x8024FEF0;
 jan_03_Quizmo_StageEffect = 0x8024FEF8;
 jan_03_Quizmo_AudienceEffect = 0x8024FEFC;
 jan_03_Quizmo_VannaTEffect = 0x8024FF00;
-D_8024FF04 = 0x8024FF04;
-end_00_CreditsProjMatrices = 0x80250EF0;
-mac_03_Quizmo_Worker = 0x802513D0;
-mac_03_Quizmo_AnswerResult = 0x802513E8;
-mac_03_Quizmo_StageEffect = 0x802513F0;
-mac_03_Quizmo_AudienceEffect = 0x802513F4;
-mac_03_Quizmo_VannaTEffect = 0x802513F8;
-mac_03_D_80251400 = 0x80251400;
 sam_11_Quizmo_Worker = 0x80251450;
 sam_11_Quizmo_AnswerResult = 0x80251468;
 sam_11_Quizmo_StageEffect = 0x80251470;
 sam_11_Quizmo_AudienceEffect = 0x80251474;
 sam_11_Quizmo_VannaTEffect = 0x80251478;
-mac_03_LetterDelivery_SavedNpcAnim = 0x802515C4;
 nok_01_Quizmo_Worker = 0x80251C40;
 nok_01_Quizmo_AnswerResult = 0x80251C58;
 nok_01_Quizmo_StageEffect = 0x80251C60;
 nok_01_Quizmo_AudienceEffect = 0x80251C64;
 nok_01_Quizmo_VannaTEffect = 0x80251C68;
-nok_01_D_80251C70 = 0x80251C70;
-D_80251E34 = 0x80251E34;
 mac_05_Quizmo_Worker = 0x802529D0;
 mac_05_Quizmo_AnswerResult = 0x802529E8;
 mac_05_Quizmo_StageEffect = 0x802529F0;
 mac_05_Quizmo_AudienceEffect = 0x802529F4;
 mac_05_Quizmo_VannaTEffect = 0x802529F8;
-mac_05_D_80252A00 = 0x80252A00;
-mac_05_D_80252BC8 = 0x80252BC8;
-mac_05_LetterDelivery_SavedNpcAnim = 0x80252D38;
-D_80253060 = 0x80253060;
-D_80253378 = 0x80253378;
-D_80253384 = 0x80253384;
-D_8025338C = 0x8025338C;
-D_80253390 = 0x80253390;
-nok_02_D_802547D0 = 0x802547D0;
 nok_02_Quizmo_AnswerResult = 0x802549B8;
 nok_02_Quizmo_Worker = 0x802549A0;
 nok_02_Quizmo_StageEffect = 0x802549C0;
 nok_02_Quizmo_AudienceEffect = 0x802549C4;
 nok_02_Quizmo_VannaTEffect = 0x802549C8;
-nok_02_D_802549D0 = 0x802549D0;
-D_80254B94 = 0x80254B94;
-nok_02_D_80254BA0 = 0x80254BA0;
-nok_02_D_80254D68 = 0x80254D68;
-mac_00_Quizmo_Worker = 0x80255B70;
-mac_00_Quizmo_AnswerResult = 0x80255B88;
-mac_00_Quizmo_StageEffect = 0x80255B90;
-mac_00_Quizmo_AudienceEffect = 0x80255B94;
-mac_00_Quizmo_VannaTEffect = 0x80255B98;
-mac_00_D_80255BA0 = 0x80255BA0;
-mac_00_D_80255D68 = 0x80255D68;
-mac_00_LetterDelivery_SavedNpcAnim = 0x80255ED8;
-D_80255EE0 = 0x80255EE0;
-dup_mac_00_LetterDelivery_SavedNpcAnim = 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;
 kmr_02_Quizmo_Worker = 0x80257F2C;
 kmr_02_Quizmo_AnswerResult = 0x80257F40;
 kmr_02_Quizmo_StageEffect = 0x80257F48;
 kmr_02_Quizmo_AudienceEffect = 0x80257F4C;
 kmr_02_Quizmo_VannaTEffect = 0x80257F50;
-kmr_21_802407F4 = 0x802407F4;
-kmr_02_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;
-mac_01_Quizmo_Worker = 0x80262A40;
-mac_01_Quizmo_AnswerResult = 0x80262A58;
-mac_01_Quizmo_StageEffect = 0x80262A60;
-mac_01_Quizmo_AudienceEffect = 0x80262A64;
-mac_01_Quizmo_VannaTEffect = 0x80262A68;
-mac_01_D_80262A70 = 0x80262A70;
-mac_01_LetterDelivery_SavedNpcAnim = 0x80262C34;
-D_80262C38 = 0x80262C38;
-D_80262F68 = 0x80262F68;
-kpa_81_D_80242040 = 0x80242040;
-osr_01_D_80242180 = 0x80242180;
-pra_02_D_80243CC0 = 0x80243CC0;

 // Unsolved BSS Mysteries
-gActionCommandStatus = 0x8029FBE0; // more bss for 16c8e0's segment
 D_80164000 = 0x80164000; // display contexts, part of bss3
+D_802AB513 = 0x802AB513;

-D_802AD673 = 0x802AD673; // remove when func_802A45D8 is decompiled with D_802AD670 instead of D_802AD673
+// os stuff
+osTvType = 0x80000300;
+osRomBase = 0x80000308;
+osMemSize = 0x80000318;
+osResetType = 0x8000030C;
+osAppNMIBuffer = 0x8000031C;
+D_800A08C0 = 0x800A08C0; // same as blendedCamSettings but seemingly a different symbol?

-// battle/item BSS
-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_802A2C20 = 0x802A2C20;
-D_802A2C50 = 0x802A2C50;
-D_802A2CC0 = 0x802A2CC0;
-D_802A2DD8 = 0x802A2DD8;
-D_802A2DEC = 0x802A2DEC;
-D_802A2DF0 = 0x802A2DF0;
-D_802A2DF4 = 0x802A2DF4;
-D_802A2DF8 = 0x802A2DF8;
-D_802A2DFC = 0x802A2DFC;
-D_802A2E00 = 0x802A2E00;
-D_802A3834 = 0x802A3834;
-D_802A3838 = 0x802A3838;
-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_802B6E90_E2A300 = 0x802B6E90;
-
-D_8024F470_hos_bss = 0x8024F470; // ??? is this real
-
-mdl_clearRenderTasks = 0x802B7E00;
-
-// boot / os stuff
+// boot
 D_A0000000 = 0xA0000000;
 D_A4000000 = 0xA4000000;
 D_A4000768 = 0xA4000768;
@ -553,14 +214,6 @@ D_A6000000 = 0xA6000000;
 D_B0000000 = 0xB0000000;
 D_B0000008 = 0xB0000008;
 D_B0000010 = 0xB0000010;
-__osExceptionPreamble = 0x8006A9F0;
-D_80095910 = 0x80095910;
-D_80095938 = 0x80095938;
-
-// BSS / unhandled data splits in dead code
-D_800A15C4 = 0x800A15C4;
-D_800B8DEC = 0x800B8DEC;
-D_80248380 = 0x80248380;

 // Invalid pointers from dead code
 dead_atan2 = 0x8002AF70;
@ -910,10 +563,5 @@ dead_kzn_17_D_802466D0 = 0x802466D0;
 dead_kzn_17_LetterDelivery_SavedNpcAnim = 0x80246894;
 dead_kzn_19_D_80248388 = 0x80248388;
 dead_kzn_19_LetterDelivery_SavedNpcAnim = 0x8024854C;
-func_8002B45C = 0x8002B45C;
-func_801266F8 = 0x801266F8;
-func_80126734 = 0x80126734;
-func_800F2E98 = 0x800F2E98;
+dead_func_800EB2A4 = 0x800F2E98;
 func_8004D8E0 = 0x8004D8E0;
-func_80059AC8 = 0x80059AC8;
-pra_02_80243E88 = 0x80243E88;