diff --git a/include/common_structs.h b/include/common_structs.h
index d060ff8f9b..ef5ce380e1 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -1734,4 +1734,18 @@ typedef struct Temp8010F250 {
     /* 0x0C */ s32 unk_0C;
 } Temp8010F250;
 
+typedef struct Temp8010EBB0 {
+    /* 0x000 */ s8 unk_00;
+    /* 0x001 */ s8 unk_01;
+    /* 0x002 */ s8 unk_02;
+    /* 0x003 */ s8 unk_03;
+    /* 0x004 */ char unk_04[0x4];
+    /* 0x008 */ s32 unk_08;
+    /* 0x009 */ char unk_0C[0x8];
+    /* 0x014 */ s8 unk_14;
+    /* 0x015 */ char unk_15[0x343];
+    /* 0x358 */ s32 unk_358;
+    /* 0x35C */ char unk_35C[0x4];
+} Temp8010EBB0; // size = 0x360
+
 #endif
diff --git a/include/functions.h b/include/functions.h
index 3794deaf81..5df735d2d0 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -132,6 +132,8 @@ s32 func_80055464(s32, s32);
 void func_800561A4(s32);
 s32 osGetId();
 
+void mem_clear(s8* data, s32 numBytes);
+
 s32* create_icon(s32 iconIndex);
 void set_icon_render_pos(s32 iconIndex, s32 posX, s32 posY);
 
@@ -144,7 +146,7 @@ void fx_emote(s32, Npc*, f32, f32, f32, f32, f32, s32, s32*);
 f32 func_800E0088(f32, f32);
 void func_800E06C0(s32);
 void close_status_menu(void);
-s32 func_800EB168(s32);
+void func_800EB168(s32);
 
 Shadow* create_shadow_type(s32 type, f32 x, f32 y, f32 z);
 
@@ -199,10 +201,13 @@ ItemEntity* get_item_entity(s32 itemEntityIndex);
 s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode itemSpawnMode, s32 pickupVar);
 void set_item_entity_flags(s32 itemEntityIndex, s32 flag);
 
+s32 bind_dynamic_entity_7(s32* updateFunc, s32* drawFunc);
+
 void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height);
 
 void disable_player_shadow(void);
 void move_player(s32 duration, f32 heading, f32 speed);
+s32 enable_player_input(void);
 
 Npc* get_npc_safe(NpcId npcId);
 Npc* get_npc_unsafe(NpcId npcId);
diff --git a/include/script_api/common.h b/include/script_api/common.h
index 1547a028c4..097ff0625a 100644
--- a/include/script_api/common.h
+++ b/include/script_api/common.h
@@ -162,7 +162,7 @@ ApiStatus SwitchMessage(ScriptInstance* script, s32 isInitialCall);
 ApiStatus ShowChoice(ScriptInstance* script, s32 isInitialCall);
 ApiStatus CloseChoice(ScriptInstance* script, s32 isInitialCall);
 ApiStatus CancelMessage(ScriptInstance* script, s32 isInitialCall);
-ApiStatus CancelMessageAndBlock(ScriptInstance* script, s32 isInitialCall);
+ApiStatus CancelMessageAndBlock(); // ???
 ApiStatus SetMessageImages(ScriptInstance* script, s32 isInitialCall);
 ApiStatus SetMessageString(ScriptInstance* script, s32 isInitialCall);
 ApiStatus SetMessageValue(ScriptInstance* script, s32 isInitialCall);
diff --git a/include/variables.h b/include/variables.h
index a2ee096b6a..97e61b125b 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -85,7 +85,6 @@ extern s16 D_8010CD00;
 extern s16 D_8010CD10;
 extern s16 D_8010CD12;
 extern s32 D_8010CD20;
-extern s32 D_8010EF08;
 extern s32 D_801595A0;
 extern BackgroundHeader gBackgroundImage;
 
@@ -229,8 +228,8 @@ extern s32 D_801086AC;
 extern s32 D_801083D8;
 extern s32 D_80108068;
 extern s32 D_80104BEC;
+extern Temp8010EBB0 D_8010EBB0; // something with partners
 extern Temp8010F250 D_8010F250; // play_sound state struct?
-extern s8 D_8010EBB0[];
 
 // Effects
 extern EffectTableEntry gEffectTable[135];
diff --git a/src/code_102610_len_2330.c b/src/code_102610_len_2330.c
index b45eb27e05..28521e504b 100644
--- a/src/code_102610_len_2330.c
+++ b/src/code_102610_len_2330.c
@@ -30,13 +30,13 @@ void func_802E10F4(Entity* entity) {
 }
 
 void func_802E114C(void) {
-    func_80027088(TRUE);
+    func_80027088(1);
     disable_player_input();
     gPlayerStatusPtr->currentSpeed = 0.0f;
 }
 
 void func_802E117C(void) {
-    func_80027088(FALSE);
+    func_80027088(0);
     enable_player_input();
 }
 
diff --git a/src/code_102C80.c b/src/code_102C80.c
index 542284afb4..c01bc3dbcc 100644
--- a/src/code_102C80.c
+++ b/src/code_102C80.c
@@ -80,7 +80,7 @@ void func_802E1614(Entity* entity) {
 void func_802E1660(Entity* entity) {
     struct802E1400* temp = entity->dataBuf;
     PlayerStatus* playerStatus = &gPlayerStatus;
-    s8* temp2 = D_8010EBB0;
+    Temp8010EBB0* temp2 = &D_8010EBB0;
 
     func_802E153C(entity);
 
@@ -104,7 +104,7 @@ void func_802E1660(Entity* entity) {
         return;
     }
 
-    if ((temp2[3] == 4) && (temp2[0] != 0)) {
+    if (temp2->unk_03 == 4 && temp2->unk_00 != 0) {
         return;
     }
 
diff --git a/src/code_1060_len_310.c b/src/code_1060_len_310.c
index f57ac3f759..92e701e6e7 100644
--- a/src/code_1060_len_310.c
+++ b/src/code_1060_len_310.c
@@ -15,21 +15,21 @@ void func_80025CC0(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
 
-    _Printf(&func_80025D74, NULL, fmt, args);
+    _Printf(func_80025D74, NULL, fmt, args);
 }
 
 void func_80025CFC(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
 
-    _Printf(&func_80025D74, NULL, fmt, args);
+    _Printf(func_80025D74, NULL, fmt, args);
 }
 
 void func_80025D38(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
 
-    _Printf(&func_80025D74, NULL, fmt, args);
+    _Printf(func_80025D74, NULL, fmt, args);
 }
 
 u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) {
@@ -79,8 +79,8 @@ u32 func_80025D74(void* arg0, const unsigned char* str, s32 count) {
     return 1;
 }
 
-extern const char D_80097D30[]; // "File:%s Line:%d  %s \n\0\0\0"
-
+extern const char D_80097D30[];
+//const char D_80097D30[] = "File:%s Line:%d  %s \n\0\0\0";
 void func_80025F44(char* arg0, char* file, s32 line, char* arg3) {
     func_80025CFC(D_80097D30, file, line, arg0);
     PANIC();
diff --git a/src/code_1f580_len_1940.c b/src/code_1f580_len_1940.c
index 587251830a..4a91508e3d 100644
--- a/src/code_1f580_len_1940.c
+++ b/src/code_1f580_len_1940.c
@@ -477,7 +477,7 @@ ApiStatus GetSelfAnimationFromTable(ScriptInstance* script, s32 isInitialCall) {
 }
 
 ApiStatus func_80045798(ScriptInstance* script, s32 isInitialCall) {
-    D_8010EF08 = get_variable(script, *script->ptrReadPos);
+    D_8010EBB0.unk_358 = get_variable(script, *script->ptrReadPos);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/code_77480.c b/src/code_77480.c
index b14ec4c33c..6490ae5987 100644
--- a/src/code_77480.c
+++ b/src/code_77480.c
@@ -202,8 +202,10 @@ void func_800DFC74(void) {
 }
 
 s32 func_800DFCF4(void) {
-    if (D_8010EBB0[0] == 1 && (D_8010EBB0[3] == 6 || D_8010EBB0[3] == 9 || D_8010EBB0[3] == 7 || D_8010EBB0[3] == 4
-                               || D_8010EBB0[3] == 8)) {
+    if (D_8010EBB0.unk_00 == 1 &&
+        (D_8010EBB0.unk_03 == 6 || D_8010EBB0.unk_03 == 9 || D_8010EBB0.unk_03 == 7 || D_8010EBB0.unk_03 == 4 ||
+         D_8010EBB0.unk_03 == 8))
+    {
         return 0;
     }
     return 1;
@@ -307,7 +309,7 @@ s32 func_800E0208(void) {
     s32 ret = 0;
 
     if (gameStatus->disableScripts && (gameStatus->currentButtons & 0x10)) {
-        if (D_8010EBB0[0] == 0) {
+        if (D_8010EBB0.unk_00 == 0) {
             set_action_state(ActionState_IDLE);
         }
         ret = 1;
diff --git a/src/code_7bb60_len_41b0.c b/src/code_7bb60_len_41b0.c
index b7d59f2976..d6acef1b32 100644
--- a/src/code_7bb60_len_41b0.c
+++ b/src/code_7bb60_len_41b0.c
@@ -17,7 +17,7 @@ s32 func_800E26C4(void) {
     PlayerStatus* playerStatus = gPlayerStatusPtr;
     PlayerData* playerData = &gPlayerData;
     s32 actionState = playerStatus->actionState;
-    s8* temp_8010EBB0 = &D_8010EBB0;
+    Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0;
 
     if (actionState == ActionState_IDLE ||
         actionState == ActionState_WALK ||
@@ -30,17 +30,17 @@ s32 func_800E26C4(void) {
 
     if (actionState == ActionState_RIDE) {
         if (playerData->currentPartner == PartnerID_LAKILESTER || playerData->currentPartner == PartnerID_BOW) {
-            if (temp_8010EBB0[0] != 0) {
+            if (temp_8010EBB0->unk_00 != 0) {
                 return 1;
             } else {
                 playerStatus->animFlags |= 4;
                 return 0;
             }
         } else {
-            if (temp_8010EBB0[3] == 6 || temp_8010EBB0[3] == 7) {
-                return temp_8010EBB0[0] != 0;
+            if (temp_8010EBB0->unk_03 == 6 || temp_8010EBB0->unk_03 == 7) {
+                return temp_8010EBB0->unk_00 != 0;
             }
-            if (temp_8010EBB0[3] == 4) {
+            if (temp_8010EBB0->unk_03 == 4) {
                 playerStatus->animFlags |= 4;
                 return 0;
             }
@@ -381,7 +381,7 @@ void set_action_state(s32 actionState) {
         partner = playerData->currentPartner;
 
         if (partner == PartnerID_SUSHIE || partner == PartnerID_LAKILESTER || partner == PartnerID_PARAKARRY) {
-            if (D_8010EBB0[0]) {
+            if (D_8010EBB0.unk_00 != 0) {
                 playerStatus->animFlags |= 0x4;
                 playerStatus->flags |= 0x800;
                 return;
@@ -468,7 +468,7 @@ s32 check_input_hammer(void) {
 
     if (playerStatus->pressedButtons & Button_B) {
         if (!(playerStatus->flags & 4)) {
-            if (D_8010EBB0[0] != 1 || playerData->currentPartner != PartnerID_WATT) {
+            if (D_8010EBB0.unk_00 != 1 || playerData->currentPartner != PartnerID_WATT) {
                 if (playerData->hammerLevel != -1) {
                     set_action_state(ActionState_HAMMER);
                     return TRUE;
diff --git a/src/code_7fd10_len_b40.c b/src/code_7fd10_len_b40.c
index 22ce97d19e..a67d14d7e0 100644
--- a/src/code_7fd10_len_b40.c
+++ b/src/code_7fd10_len_b40.c
@@ -3,7 +3,7 @@
 void func_800E6860(void) {
     PlayerStatus* playerStatus = &gPlayerStatus;
 
-    if ((D_8010EBB0[0] != 0) && (D_8010EBB0[3] == 9)) {
+    if (D_8010EBB0.unk_00 != 0 && D_8010EBB0.unk_03 == 9) {
         Npc* partner = get_npc_unsafe(NpcId_PARTNER);
 
         func_802DDEE4(0, -1, 7, 0, 0, 0, playerStatus->unk_0E, 0);
@@ -15,25 +15,25 @@ void func_800E6860(void) {
 // playerStatus getting coppied to a0 - how? inlining?
 #ifdef NON_MATCHING
 s32 func_800E6904(void) {
-    s8* temp_8010EBB0 = D_8010EBB0;
+    Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0;
     PlayerStatus* playerStatus = &gPlayerStatus;
     s32 actionState = playerStatus->actionState;
 
     if (!(playerStatus->animFlags & 0x100000)) {
-        if (temp_8010EBB0[0] == 0) {
+        if (temp_8010EBB0.unk_00 == 0) {
             if (!(playerStatus->flags & 0x1000)) {
                 if (actionState == ActionState_IDLE || actionState == ActionState_WALK || actionState == ActionState_RUN) {
                     return 1;
                 }
             }
         } else if (partner_player_can_pause()) {
-            if (temp_8010EBB0[3] == 6) {
+            if (temp_8010EBB0.unk_03 == 6) {
                 return 1;
-            } else if (temp_8010EBB0[3] == 9) {
+            } else if (temp_8010EBB0.unk_03 == 9) {
                 if (actionState == ActionState_RIDE) {
                     return 1;
                 }
-            } else if (temp_8010EBB0[3] == 8) {
+            } else if (temp_8010EBB0.unk_03 == 8) {
                 if (actionState != ActionState_RIDE) {
                     play_sound(0x21D);
                 } else {
diff --git a/src/code_E21870.c b/src/code_E21870.c
index 999c6f2af2..8104c935cc 100644
--- a/src/code_E21870.c
+++ b/src/code_E21870.c
@@ -1,11 +1,11 @@
 #include "common.h"
 
 s32 func_802B7000_2(void) {
-    s8* something = &D_8010EBB0;
+    Temp8010EBB0* something = &D_8010EBB0;
     ActionState* actionState = gPlayerActionState;
 
     if (actionState != ActionState_USE_TWEESTER) {
-        if (something[0] != 1 || (something[3] != 9 && something[3] != 4)) {
+        if (something->unk_00 != 1 || (something->unk_03 != 9 && something->unk_03 != 4)) {
             return 0;
         }
     }
diff --git a/src/code_F5750.c b/src/code_F5750.c
index 8a2c8cf8f6..581446f708 100644
--- a/src/code_F5750.c
+++ b/src/code_F5750.c
@@ -382,7 +382,7 @@ ApiStatus GetCurrentPartner(ScriptInstance* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;
     s32 currentPartner = 0;
 
-    if (D_8010EBB0[0] != 0) {
+    if (D_8010EBB0.unk_00 != 0) {
         currentPartner = playerData->currentPartner;
     }
 
diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c
index 1f260fc178..d666611b03 100644
--- a/src/code_b72b0_len_15ed0.c
+++ b/src/code_b72b0_len_15ed0.c
@@ -112,7 +112,7 @@ void init_dynamic_entity_list(void) {
 
 INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_3);
 
-INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_7);
+INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_7, s32* updateFunc, s32* drawFunc);
 
 INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_B);
 
diff --git a/src/code_f4c60_len_4300.c b/src/code_f4c60_len_4300.c
index 70fb136769..c5e4fa97ac 100644
--- a/src/code_f4c60_len_4300.c
+++ b/src/code_f4c60_len_4300.c
@@ -68,7 +68,7 @@ ApiStatus CancelMessage(ScriptInstance* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus CancelMessageAndBlock(ScriptInstance* script, s32 isInitialCall) {
+ApiStatus CancelMessageAndBlock() {
     cancel_message(gCurrentPrintContext);
     return ApiStatus_BLOCK;
 }
diff --git a/src/code_fee30_len_2d60.c b/src/code_fee30_len_2d60.c
index c6f44f7130..63bbeffcd5 100644
--- a/src/code_fee30_len_2d60.c
+++ b/src/code_fee30_len_2d60.c
@@ -1,7 +1,71 @@
 #include "common.h"
 
+s32 D_802DF390[] = { 0xFFF00038, 0x00000000, 0x00000000, 0xF0F0F0FF, 0x00100038, 0x00000000, 0x04000000, 0x787878FF,
+                     0x00100000, 0x00000000, 0x04000700, 0x000000FF, 0xFFF00000, 0x00000000, 0x00000700, 0x787878FF, };
+
+s32 D_802DF3D0[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000, };
+
+s32 D_802DF3E0[] = { 0x028001E0, 0x01FF0000, 0x028001E0, 0x02000000, };
+
+Gfx D_802DF3F0[] = {
+    gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING),
+    gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA),
+    gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH),
+    gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM), AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)),
+    gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE),
+    gsSPEndDisplayList(),
+};
+
+Gfx D_802DF428[] = {
+    gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING),
+    gsDPSetCombineLERP(0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0),
+    gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH),
+    gsDPSetRenderMode(G_RM_ZB_CLD_SURF, G_RM_ZB_CLD_SURF2),
+    gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE),
+    gsSPEndDisplayList(),
+};
+
+Gfx D_802DF460[] = {
+    gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING),
+    gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH),
+    gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | G_RM_PASS, AA_EN | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)),
+    gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE),
+    gsSPEndDisplayList(),
+};
+
+Gfx D_802DF490[] = {
+    gsSPClearGeometryMode(G_CULL_BOTH | G_LIGHTING),
+    gsSPTexture(-1, -1, 0, G_TX_RENDERTILE, G_ON),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH),
+    gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2),
+    gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_ALPHADITHER, 18, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE),
+    gsSPEndDisplayList(),
+};
+
+f32 D_802DF4C0 = 1.0f;
+
+s32 D_802DF4C4[] = { 0x00000006, 0x00000700, 0x000003C6, 0x00000012, 0x00000700, 0x000003C6, 0x0000000A, 0x00000900, 0x00003FC6, 0x00000003, 0x00000700, 0x00000006, 0x00000006, 0x00000900, 0x00003C00, 0x00000006, 0x00000700, 0x0000003E, 0x00000006, 0x00000900, 0x00003C00, 0x00000000, 0x00000000, };
+
+
 INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBD40);
 
+// extern s32* gSpriteHeapPtr;
+// extern s32** D_802DFE44;
+// extern s32* D_802DFE9C;
+
+// void func_802DBD40(void) {
+//     s32 i;
+//     s32* phi_v0;
+//     D_802DFE44 = _heap_malloc(&gSpriteHeapPtr, 0x580);
+
+//     for (i = 21; i >= 0; i--) {
+//         D_802DFE44[i] = -1;
+//     }
+// }
+
 INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBD8C);
 
 INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBDBC);
@@ -14,7 +78,36 @@ INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DC008);
 
 INCLUDE_ASM(s32, "code_fee30_len_2d60", spr_appendMDL_component);
 
-INCLUDE_ASM(s32, "code_fee30_len_2d60", spr_transform_point);
+void spr_transform_point(s32 rotX, s32 rotY, s32 rotZ, f32 inX, f32 inY, f32 inZ, f32* outX, f32* outY, f32* outZ) {
+    if (rotX == 0 && rotY == 0 && rotZ == 0) {
+        *outX = inX;
+        *outY = inY;
+        *outZ = inZ;
+    } else {
+        Matrix4f mtx, mtx2;
+        f32 f1, f2, f3, f4, f5, f6, f7, f8, f9;
+
+        guRotateF(&mtx, rotY, 0.0f, 1.0f, 0.0f);
+        guRotateF(&mtx2, rotZ, 0.0f, 0.0f, 1.0f);
+        guMtxCatF(&mtx2, &mtx, &mtx);
+        guRotateF(&mtx2, rotX, 1.0f, 0.0f, 0.0f);
+        guMtxCatF(&mtx2, &mtx, &mtx);
+
+        f1 = (mtx[0][0] * inX);
+        f2 = (mtx[1][0] * inY);
+        f3 = (mtx[2][0] * inZ);
+        f4 = (mtx[0][1] * inX);
+        f5 = (mtx[1][1] * inY);
+        f6 = (mtx[2][1] * inZ);
+        f7 = (mtx[0][2] * inX);
+        f8 = (mtx[1][2] * inY);
+        f9 = (mtx[2][2] * inZ);
+
+        *outX = f1 + f2 + f3;
+        *outY = f4 + f5 + f6;
+        *outZ = f7 + f8 + f9;
+    }
+}
 
 INCLUDE_ASM(s32, "code_fee30_len_2d60", spr_draw_component);
 
@@ -48,7 +141,9 @@ INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD7B0);
 
 INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD820);
 
-INCLUDE_ASM(s32, "code_fee30_len_2d60", set_anim_timescale);
+void set_anim_timescale(f32 arg0) {
+    D_802DF4C0 = arg0 * 2.0f;
+}
 
 INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD89C);
 
diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c
index f0631a1bf8..5015e85729 100644
--- a/src/world/partner/bombette.c
+++ b/src/world/partner/bombette.c
@@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/partner/bombette", func_802BD6DC_31842C);
 INCLUDE_ASM(s32, "world/partner/bombette", func_802BD720_318470);
 
 s32 func_802BD748(void) {
-    return D_8010EBB0[0] == 0;
+    return D_8010EBB0.unk_00 == 0;
 }
 
 INCLUDE_ASM(s32, "world/partner/bombette", func_802BD758_3184A8);
diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c
index e1d45b20b3..ce7d35fbda 100644
--- a/src/world/partner/goombario.c
+++ b/src/world/partner/goombario.c
@@ -29,7 +29,7 @@ INCLUDE_ASM(s32, "world/partner/goombario", func_802BD564_317484);
 // Compiler is generating more efficient code than the original asm, using xori and sltiu instead of beq
 #ifdef NON_MATCHING
 s32 world_goombario_can_pause(Npc* partner) {
-    if (D_8010EBB0[0]) {
+    if (D_8010EBB0.unk_00) {
         return FALSE;
     }
 
@@ -59,23 +59,23 @@ ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall) {
     return func_800EE9B8(unk) != 0;
 }
 
-// Something is up with D_8010EBB0 I think. It might be a struct or something
-#ifdef NON_MATCHING
 void world_goombario_pre_battle(Npc* partner) {
-    if (D_8010EBB0[0] != 0) {
+    // TODO fake match nonsense
+    s8* new_var = &D_8010EBB0.unk_00;
+    s8* new_var2 = &D_8010EBB0.unk_00;
+    new_var = new_var2;
+
+    if (*new_var != 0) {
         func_80027088(0);
         enable_player_input();
         CancelMessageAndBlock();
         clear_partner_move_history(partner);
-        D_8010EBB0[0] = 0;
-        D_8010EBB0[3] = 0;
+        D_8010EBB0.unk_00 = 0;
+        D_8010EBB0.unk_03 = 0;
         disable_npc_blur(partner);
     }
-    D_8010EBB0[3] = 1;
+    D_8010EBB0.unk_03 = 1;
 }
-#else
-INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, Npc* partner);
-#endif
 
 s32 D_802BDC40_317B60[] = {
     0x00000015, 0x001B0000, 0x00000018, 0x001B0000, 0x00000016, 0x001B0001, 0x00000019, 0x001B0001,
diff --git a/src/world/partners.c b/src/world/partners.c
index 2ef68bb68e..4644f8573a 100644
--- a/src/world/partners.c
+++ b/src/world/partners.c
@@ -55,7 +55,7 @@ s32 D_800F7FF4 = 4;
 s32 D_800F7FF8 = 5;
 s32 D_800F7FFC = 7;
 s32 D_800F8000[] = { 8, 0, 0, 0 };
-s32 D_800F8010[] = { 0x003251D0, 0x00325AD0, (s32)&D_802C05CC, 0x00000000 };
+s32 D_800F8010[] = { &code_code_3251D0_ROM_START, &code_code_3251D0_ROM_END, (s32)&D_802C05CC, 0x00000000 };
 s32 D_800F8020 = 0;
 s32 D_800F8024 = 0;
 s32 D_800F8028 = 0;
@@ -245,10 +245,30 @@ WorldPartner wPartners[12] = {
     },
 };
 
+f32 D_800F833C = 0;
+f32 D_800F8340 = 0;
+f32 D_800F8344 = 0;
 
 NpcId create_basic_npc(NpcBlueprint* blueprint);
 
+extern s32 D_802C0000;
+
+// Some weird ordering issues, probably a macro at play
+#ifdef NON_MATCHING
+s32 use_consumable(s32 arg0) {
+    ScriptInstance* script;
+    s32 temp_s1;
+
+    temp_s1 = gPlayerData.invItems[arg0];
+    D_8010CD20 = arg0;
+    dma_copy(D_800F8010[0], D_800F8010[1], &D_802C0000);
+    script = start_script(D_800F8010[2], 1, 0);
+    script->varTable[10] = temp_s1;
+    return script->id;
+}
+#else
 INCLUDE_ASM(s32, "world/partners", use_consumable);
+#endif
 
 void remove_consumable(void) {
     gPlayerData.invItems[D_8010CD20] = 0;
@@ -258,7 +278,7 @@ void remove_consumable(void) {
 INCLUDE_ASM(s32, "world/partners", func_800EA4B0);
 
 s32 world_partner_can_use_ability_default(Npc* partner) {
-    return D_8010EBB0[0] == 0;
+    return D_8010EBB0.unk_00 == 0;
 }
 
 s32 world_partner_can_player_pause_default(Npc* partner) {
@@ -268,7 +288,7 @@ s32 world_partner_can_player_pause_default(Npc* partner) {
 INCLUDE_ASM(s32, "world/partners", func_800EA52C);
 
 s32 is_current_partner_flying(void) {
-    return !D_8010CFEC->isFlying;
+    return !wPartner->isFlying;
 }
 
 void func_800EA5B8(s32* arg0) {
@@ -277,8 +297,8 @@ void func_800EA5B8(s32* arg0) {
 
 void load_partner_npc(void) {
     WorldPartner* partnerEntry = &wPartners[D_8010CFD8];
-    Npc** partnerNpcPtr = &D_8010C930;
-    WorldPartner** partner = &D_8010CFEC;
+    Npc** partnerNpcPtr = &wPartnerNpc;
+    WorldPartner** partner = &wPartner;
     NpcId npcIndex;
     NpcBlueprint blueprint;
     NpcBlueprint* blueprintPtr;
@@ -321,26 +341,132 @@ void func_800EA6A8(void) {
 
 INCLUDE_ASM(s32, "world/partners", _use_partner_ability);
 
-INCLUDE_ASM(s32, "world/partners", func_800EB168, s32 arg0);
+void func_800EB168(s32 arg0) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
-INCLUDE_ASM(s32, "world/partners", func_800EB200);
+    if (D_8010CFD8 != arg0) {
+        D_8010CFE0 = 1;
+        D_8010CFE4 = arg0;
 
-INCLUDE_ASM(s32, "world/partners", func_800EB2A4);
+        if (D_8010CFD8 != 0 && arg0 != 0) {
+            D_8010CFE8 = 3;
+        } else if (arg0 == 0) {
+            D_8010CFE8 = 4;
+        } else {
+            D_8010CFE8 = 6;
+            D_800F833C = playerStatus->position.x;
+            D_800F8340 = playerStatus->position.y;
+            D_800F8344 = playerStatus->position.z;
+        }
+    }
+}
 
-INCLUDE_ASM(s32, "world/partners", partner_use_ability);
+void func_800EB200(s32 arg0) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Temp8010EBB0* temp8010EBB0 = &D_8010EBB0;
 
-INCLUDE_ASM(s32, "world/partners", partner_player_can_pause, void);
+    if (D_8010CFD8 != arg0) {
+        D_8010CFE0 = 1;
+        D_8010CFE4 = arg0;
+        temp8010EBB0->unk_00 = 0;
+        temp8010EBB0->unk_01 = 0;
 
-INCLUDE_ASM(s32, "world/partners", partner_can_use_ability);
+        if (D_8010CFD8 != 0 && arg0 != 0) {
+            D_8010CFE8 = 2;
+        } else if (arg0 == 0) {
+            D_8010CFE8 = 4;
+        } else {
+            D_8010CFE8 = 6;
+            D_800F833C = playerStatus->position.x;
+            D_800F8340 = playerStatus->position.y;
+            D_800F8344 = playerStatus->position.z;
+        }
+    }
+}
+
+void func_800EB2A4(s32 arg0) {
+    if (D_8010CFD8 != arg0) {
+        D_8010CFE0 = 1;
+        D_8010CFE4 = arg0;
+
+        if (D_8010CFD8 != 0 && arg0 != 0) {
+            D_8010CFE8 = 3;
+        } else if (arg0 == 0) {
+            D_8010CFE8 = 5;
+        } else {
+            D_8010CFE8 = 7;
+        }
+    }
+}
+
+s32 partner_use_ability(void) {
+    Temp8010EBB0* temp8010EBB0 = &D_8010EBB0;
+
+    if (!is_starting_conversation() &&
+        wPartner != NULL &&
+        (wPartner->canUseAbility == NULL || wPartner->canUseAbility(wPartnerNpc)))
+    {
+        if (((*gGameStatusPtr)->unk_81 != 0) && (temp8010EBB0->unk_08 & 0x4000)) {
+            play_sound(0x21D);
+        } else if (D_8010CFD8 != 0) {
+            D_8010CFE0 = 1;
+            D_8010CFE8 = 8;
+            _use_partner_ability();
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+// needless v0 to v1 thing. functionally equivalent
+#ifdef NON_MATCHING
+s32 partner_player_can_pause(void) {
+    if (wPartner == NULL || wPartner->canPlayerPause == NULL || wPartner->canPlayerPause(wPartnerNpc)) {
+        return TRUE;
+    }
+    return FALSE;
+}
+#else
+INCLUDE_ASM(s32, "world/partners", partner_player_can_pause, void)
+#endif
+
+s32 partner_can_use_ability(void) {
+    if (wPartner->canUseAbility != NULL && !wPartner->canUseAbility(wPartnerNpc)) {
+        return TRUE;
+    }
+    return FALSE;
+}
 
 INCLUDE_ASM(s32, "world/partners", partner_reset_data);
 
-INCLUDE_ASM(s32, "world/partners", partner_initialize_data);
+void partner_initialize_data(void) {
+    Temp8010EBB0* unk8010EBB0 = &D_8010EBB0;
 
-INCLUDE_ASM(s32, "world/partners", partner_test_enemy_collision);
+    D_8010CFD8 = 0;
+    D_8010CFE0 = 0;
+    D_8010CFE8 = 0;
+    D_8010CFC4 = 0;
+    unk8010EBB0->unk_03 = 0;
+    unk8010EBB0->unk_14 = 0;
+    unk8010EBB0->unk_01 = 0;
+    unk8010EBB0->unk_00 = 0;
+    unk8010EBB0->unk_358 = 0;
+    unk8010EBB0->unk_02 = 0;
+    wPartner = NULL;
+    D_800F833C = 0;
+    D_800F8340 = 0;
+    D_800F8344 = 0;
+}
+
+s32 partner_test_enemy_collision(s32 arg0) {
+    if (D_8010CFD8 != 0 && wPartner->testFirstStrike != NULL) {
+        return wPartner->testFirstStrike(wPartnerNpc, arg0);
+    }
+    return FALSE;
+}
 
 Bytecode* partner_get_ride_script(void) {
-    WorldPartner* partner = D_8010CFEC;
+    WorldPartner* partner = wPartner;
 
     if (partner == NULL) {
         return NULL;
@@ -348,15 +474,78 @@ Bytecode* partner_get_ride_script(void) {
     return partner->whileRiding;
 }
 
-INCLUDE_ASM(s32, "world/partners", partner_handle_before_battle);
+void partner_handle_before_battle(void) {
+    if (D_8010CFD8 != 0) {
+        ScriptID* scriptID = &D_8010CFDC;
 
-INCLUDE_ASM(s32, "world/partners", partner_handle_after_battle);
+        if (does_script_exist(*scriptID)) {
+            kill_script_by_ID(*scriptID);
+        }
 
-INCLUDE_ASM(s32, "world/partners", partner_kill_ability_script);
+        if (wPartner->preBattle != NULL) {
+            wPartner->preBattle(wPartnerNpc);
+        }
+    }
+}
 
-INCLUDE_ASM(s32, "world/partners", partner_suspend_ability_script);
+void partner_handle_after_battle(void) {
+    s8* temp8010EBB0 = &D_8010EBB0;
 
-INCLUDE_ASM(s32, "world/partners", partner_resume_ability_script);
+    if (D_8010CFD8 != 0) {
+        ScriptID* scriptID = &D_8010CFDC;
+        PlayerData* playerData = &gPlayerData;
+
+        if (does_script_exist(*scriptID) != 0) {
+            kill_script_by_ID(*scriptID);
+        }
+
+        D_8010CFD4 = start_script(wPartner->update, 20, 0x20);
+        D_8010CFD4->owner2.npc = wPartnerNpc;
+        *scriptID = D_8010CFD4->id;
+        D_8010CFD4->groupFlags = 0xA;
+
+        D_8010CFE8 = 1;
+
+        if (playerData->currentPartner != PartnerID_WATT && temp8010EBB0[3] == 6) {
+            gPlayerStatusPtr->animFlags &= ~1;
+            gPlayerStatusPtr->animFlags &= ~2;
+            temp8010EBB0[3] = 0;
+        }
+
+        if (wPartner->postBattle != NULL) {
+            wPartner->postBattle(wPartnerNpc);
+        }
+    }
+}
+
+void partner_kill_ability_script(void) {
+    ScriptID* scriptID = &D_8010CFDC;
+    D_8010CFE8 = 10;
+
+    if (does_script_exist(*scriptID)) {
+        kill_script_by_ID(*scriptID);
+    }
+}
+
+void partner_suspend_ability_script(void) {
+    if (D_8010CFD8 != NULL) {
+        ScriptID* scriptID = &D_8010CFDC;
+
+        if (does_script_exist(*scriptID)) {
+            suspend_all_script(*scriptID);
+        }
+    }
+}
+
+void partner_resume_ability_script(void) {
+    if (D_8010CFD8 != NULL) {
+        ScriptID* scriptID = &D_8010CFDC;
+
+        if (does_script_exist(*scriptID)) {
+            resume_all_script(*scriptID);
+        }
+    }
+}
 
 INCLUDE_ASM(void, "world/partners", enable_partner_walking, Npc* partner, s32 val);
 
@@ -405,7 +594,18 @@ void func_800EF314(void) {
     D_8010CFC8 = 50;
 }
 
-INCLUDE_ASM(void, "world/partners", enable_partner_ai, void);
+void enable_partner_ai(void) {
+    WorldPartner** partner = &wPartnerNpc;
+
+    D_8010CFC8 = 0;
+    clear_partner_move_history(*partner);
+
+    if (!wPartner->isFlying) {
+        enable_partner_walking(*partner, FALSE);
+    } else {
+        enable_partner_flying(*partner, FALSE);
+    }
+}
 
 void set_parter_tether_distance(f32 arg0) {
     D_8010CFC0 = arg0;
@@ -447,18 +647,18 @@ INCLUDE_ASM(void, "world/partners", clear_partner_move_history, Npc* partner);
 INCLUDE_ASM(s32, "world/partners", func_800EF4E0);
 
 void func_800EF600(void) {
-    s8* temp_8010EBB0 = D_8010EBB0;
+    Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0;
 
-    temp_8010EBB0[20]--;
-    if (temp_8010EBB0[20] < 0) {
-        temp_8010EBB0[20] = 0;
+    temp_8010EBB0->unk_14--;
+    if (temp_8010EBB0->unk_14 < 0) {
+        temp_8010EBB0->unk_14 = 0;
     }
 }
 
 void func_800EF628(void) {
-    s8* temp_8010EBB0 = D_8010EBB0;
+    Temp8010EBB0* temp_8010EBB0 = &D_8010EBB0;
 
-    temp_8010EBB0[20]++;
+    temp_8010EBB0->unk_14++;
 }
 
 INCLUDE_ASM(s32, "world/partners", func_800EF640);
diff --git a/src/world/partners.h b/src/world/partners.h
index 4d1b17989f..0d84ed761e 100644
--- a/src/world/partners.h
+++ b/src/world/partners.h
@@ -3,31 +3,41 @@
 
 #include "common.h"
 
+typedef void (*PartnerFunc)(Npc* partner);
+typedef s32 (*PartnerBoolFunc)(Npc* partner);
+typedef s32 (*PartnerUnkFunc)(Npc* partner, s32 arg1);
+
 typedef struct WorldPartner {
     /* 0x00 */ void* dmaStart;
     /* 0x04 */ void* dmaEnd;
     /* 0x08 */ void* dmaDest; ///< Always `0x802BD100`
     /* 0x0C */ s32 isFlying;
-    /* 0x10 */ void (*init)(Npc* partner);
+    /* 0x10 */ PartnerFunc init;
     /* 0x14 */ Bytecode* takeOut;
     /* 0x18 */ Bytecode* update;
     /* 0x1C */ Bytecode* useAbility;
     /* 0x20 */ Bytecode* putAway;
     /* 0x24 */ NpcAnimID idle;
-    /* 0x28 */ UNK_FUN_PTR(testFirstStrike);
-    /* 0x2C */ s32 (*canUseAbility)(Npc* partner);
-    /* 0x30 */ s32 (*canPlayerPause)(Npc* partner);
-    /* 0x34 */ void (*preBattle)(Npc* partner);
-    /* 0x38 */ UNK_FUN_PTR(postBattle);
+    /* 0x28 */ PartnerUnkFunc testFirstStrike;
+    /* 0x2C */ PartnerBoolFunc canUseAbility;
+    /* 0x30 */ PartnerBoolFunc canPlayerPause;
+    /* 0x34 */ PartnerFunc preBattle;
+    /* 0x38 */ PartnerFunc postBattle;
     /* 0x3C */ Bytecode* whileRiding;
 } WorldPartner; // size = 0x40
 
-/// Set to 0 when partner NPC loaded
 extern s32 D_8010C954;
+extern s32 D_8010CFC4;
+extern ScriptInstance* D_8010CFD4;
 extern s32 D_8010CFD8;
-extern WorldPartner wPartners[12]; // wPartners
-extern WorldPartner* D_8010CFEC; // wPartner
+extern ScriptID D_8010CFDC;
+extern s32 D_8010CFE0;
+extern s32 D_8010CFE4;
+extern s32 D_8010CFE8;
+
+extern WorldPartner wPartners[12];
+extern WorldPartner* wPartner;
 extern NpcId D_8010CFD0; // wPartnerNpcIndex
-extern Npc* D_8010C930; // wPartnerNpc
+extern Npc* wPartnerNpc; // wPartnerNpc
 
 #endif
diff --git a/src/world/script_api/7E4690.c b/src/world/script_api/7E4690.c
index 90f0d83225..91c774ae48 100644
--- a/src/world/script_api/7E4690.c
+++ b/src/world/script_api/7E4690.c
@@ -6,7 +6,7 @@ ApiStatus func_80283810(ScriptInstance* script, s32 isInitialCall) {
 
     script->varTable[10] = 0;
     if (partner_get_ride_script() != NULL) {
-        if (D_8010EBB0[0] == 0) {
+        if (D_8010EBB0.unk_00 == 0) {
             script->varTable[10] = 0;
         } else {
             script->varTable[10] = 1;
diff --git a/src/world/world.c b/src/world/world.c
index 59191a194f..b4dbc6a3ed 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -18,9 +18,9 @@ static const s32 rodata_73DA0[] = {
 };
 
 // These string literals belong to load_map_by_IDs
-static const char D_80098A10[] = "%s_shape";
-static const char D_80098A1C[] = "%s_hit";
-static const char D_80098A24[] = "%s_tex";
+// static const char D_80098A10[] = "%s_shape";
+// static const char D_80098A1C[] = "%s_hit";
+// static const char D_80098A24[] = "%s_tex";
 
 INCLUDE_ASM(s32, "world/world", load_map_by_IDs);
 
diff --git a/tools/m2ctx.py b/tools/m2ctx.py
index d77e76447b..9b51292c47 100755
--- a/tools/m2ctx.py
+++ b/tools/m2ctx.py
@@ -26,7 +26,7 @@ def get_c_file(directory):
 
 def import_c_file(in_file):
     in_file = os.path.relpath(in_file, root_dir)
-    cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-Ibuild/include" ,"-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file]
+    cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-Iver/current/build/include" ,"-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file]
     try:
         return subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8")
     except subprocess.CalledProcessError:
diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo
index 102361d21b..967bcbbf3f 100644
--- a/tools/splat/.gitrepo
+++ b/tools/splat/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/ethteck/splat.git
 	branch = master
-	commit = 97e51bdf2124a90a856fcb0c695f01fa15360e5d
-	parent = 1af3672136ec6d609d9ce31f23fb472cf1e359f0
+	commit = 53370e3217fb075e196c9ad4ecfdecfeac52bceb
+	parent = 0488245e2733bcca986dc68c5abeeeb04de3b50f
 	method = merge
 	cmdver = 0.4.3
diff --git a/tools/splat/segtypes/n64/ci4.py b/tools/splat/segtypes/n64/ci4.py
index 0b33f1ec6f..349423c506 100644
--- a/tools/splat/segtypes/n64/ci4.py
+++ b/tools/splat/segtypes/n64/ci4.py
@@ -12,5 +12,4 @@ class N64SegCi4(N64SegCi8):
         return img_data
 
     def max_length(self):
-        if self.compressed: return None
         return self.width * self.height // 2
diff --git a/tools/splat/segtypes/n64/ci8.py b/tools/splat/segtypes/n64/ci8.py
index ee74810e74..a8772eae4e 100644
--- a/tools/splat/segtypes/n64/ci8.py
+++ b/tools/splat/segtypes/n64/ci8.py
@@ -15,8 +15,6 @@ class N64SegCi8(N64SegRgba16):
         self.path = os.path.join(out_dir, os.path.basename(self.name) + ".png")
 
         data = rom_bytes[self.rom_start: self.rom_end]
-        if self.compressed:
-            data = Yay0decompress.decompress_yay0(data)
 
         self.image = self.parse_image(data, self.width, self.height)
 
@@ -57,6 +55,4 @@ class N64SegCi8(N64SegRgba16):
         return data
 
     def max_length(self):
-        if self.compressed:
-            return None
         return self.width * self.height
diff --git a/tools/splat/segtypes/n64/code.py b/tools/splat/segtypes/n64/code.py
index 331ba14178..2f9e3a28de 100644
--- a/tools/splat/segtypes/n64/code.py
+++ b/tools/splat/segtypes/n64/code.py
@@ -1,19 +1,16 @@
-from capstone import *
-from capstone.mips import *
-
-from collections import OrderedDict
-from segtypes.n64.segment import N64Segment
-from segtypes.segment import Segment
-from segtypes.n64.palette import N64SegPalette
-from segtypes.n64.ci4 import N64SegCi4
-from segtypes.n64.rgba32 import N64SegRgba32
-
-import json
-import png
 import os
-from pathlib import Path, PurePath
 import re
 import sys
+from collections import OrderedDict
+from pathlib import Path, PurePath
+
+import png
+from capstone import *
+from capstone.mips import *
+from segtypes.n64.ci4 import N64SegCi4
+from segtypes.n64.palette import N64SegPalette
+from segtypes.n64.segment import N64Segment
+from segtypes.segment import Segment
 from util import floats
 from util.symbol import Symbol
 
@@ -24,7 +21,7 @@ short_mnemonics = ["addiu", "lh", "sh", "lhu"]
 byte_mnemonics = ["lb", "sb", "lbu"]
 
 class Subsegment():
-    def __init__(self, start, end, name, type, vram, args):
+    def __init__(self, start, end, name, type, vram, args, parent):
         self.rom_start = start
         self.rom_end = end
         self.size = self.rom_end - self.rom_start
@@ -33,19 +30,18 @@ class Subsegment():
         self.vram_end = vram + self.size
         self.type = type
         self.args = args
-
-        # TODO maybe move to a better place
-        if self.type in [".bss", "bss"]:
-            self.rom_start = 0
-            self.rom_end = 0
-            self.size = self.args[0]
-            self.vram_end = self.vram_start + self.size
+        self.parent = parent
 
     def contains_vram(self, addr):
         return self.vram_start <= addr < self.vram_end
 
     def get_out_subdir(self, options):
-        if self.type in ["c", ".data", ".rodata", ".bss"]:
+        if self.type.startswith("."):
+            if self.parent:
+                return self.parent.get_out_subdir(options)
+            else:
+                return options.get("src_path", "src")
+        elif self.type in ["c"]:
             return options.get("src_path", "src")
         elif self.type in ["asm", "hasm", "header"]:
             return "asm"
@@ -67,7 +63,12 @@ class Subsegment():
         return section_name
 
     def get_ext(self):
-        if self.type in ["c", ".data", ".rodata", ".bss"]:
+        if self.type.startswith("."):
+            if self.parent:
+                return self.parent.get_ext()
+            else:
+                return "c"
+        elif self.type in ["c"]:
             return "c"
         elif self.type in ["asm", "hasm", "header"]:
             return "s"
@@ -89,6 +90,13 @@ class Subsegment():
             self.name + "." + self.get_ext()
         )
 
+    def scan_inner(self, segment, rom_bytes):
+        pass
+
+    def scan(self, segment, rom_bytes):
+        if self.should_run(segment.options) and not self.name.startswith("."):
+            self.scan_inner(segment, rom_bytes)
+
     def split_inner(self, segment, rom_bytes, base_path, generic_out_path):
         pass
 
@@ -145,7 +153,7 @@ class CodeSubsegment(Subsegment):
         return set(m.group(2) for m in CodeSubsegment.C_FUNC_RE.finditer(text))
 
     @staticmethod
-    def get_asm_header():
+    def get_standalone_asm_header():
         ret = []
 
         ret.append(".include \"macro.inc\"")
@@ -160,15 +168,11 @@ class CodeSubsegment(Subsegment):
 
         return ret
 
-    def split_inner(self, segment, rom_bytes, base_path, generic_out_path):
+    def scan_inner(self, segment, rom_bytes):
         if not self.rom_start == self.rom_end:
-            asm_out_dir = Segment.create_split_dir(base_path, "asm")
-
-            rom_addr = self.rom_start
-
             insns = [insn for insn in CodeSubsegment.md.disasm(rom_bytes[self.rom_start : self.rom_end], self.vram_start)]
 
-            funcs = segment.process_insns(insns, rom_addr)
+            funcs = segment.process_insns(insns, self.rom_start)
 
             # TODO: someday make func a subclass of symbol and store this disasm info there too
             for func in funcs:
@@ -176,29 +180,31 @@ class CodeSubsegment(Subsegment):
 
             funcs = segment.determine_symbols(funcs)
             segment.gather_jumptable_labels(rom_bytes)
-            funcs_text = segment.add_labels(funcs)
+            self.funcs_text = segment.add_labels(funcs)
 
+    def split_inner(self, segment, rom_bytes, base_path, generic_out_path):
+        if not self.rom_start == self.rom_end:
             if self.type == "c":
                 defined_funcs = set()
-
                 if segment.options.get("do_c_func_detection", True) and os.path.exists(generic_out_path):
                     defined_funcs = CodeSubsegment.get_funcs_defined_in_c(generic_out_path)
                     segment.mark_c_funcs_as_defined(defined_funcs)
 
                 asm_out_dir = Segment.create_split_dir(base_path, os.path.join("asm", "nonmatchings"))
 
-                for func in funcs_text:
+                for func in self.funcs_text:
                     func_name = segment.get_symbol(func, type="func", local_only=True).name
 
                     if func_name not in defined_funcs:
-                        segment.create_c_asm_file(funcs_text, func, asm_out_dir, self, func_name)
+                        segment.create_c_asm_file(self.funcs_text, func, asm_out_dir, self, func_name)
 
                 if not os.path.exists(generic_out_path) and segment.options.get("create_new_c_files", True):
-                    segment.create_c_file(funcs_text, self, asm_out_dir, base_path, generic_out_path)
+                    segment.create_c_file(self.funcs_text, self, asm_out_dir, base_path, generic_out_path)
             else:
-                out_lines = self.get_asm_header()
-                for func in funcs_text:
-                    out_lines.extend(funcs_text[func][0])
+                asm_out_dir = Segment.create_split_dir(base_path, "asm")
+                out_lines = self.get_standalone_asm_header()
+                for func in self.funcs_text:
+                    out_lines.extend(self.funcs_text[func][0])
                     out_lines.append("")
 
                 outpath = Path(os.path.join(asm_out_dir, self.name + ".s"))
@@ -208,6 +214,10 @@ class CodeSubsegment(Subsegment):
                     f.write("\n".join(out_lines))
 
 class DataSubsegment(Subsegment):
+    def scan_inner(self, segment, rom_bytes):
+        if not self.type.startswith(".") or self.type == ".rodata":
+            self.file_text = segment.disassemble_data(self, rom_bytes)
+
     def split_inner(self, segment, rom_bytes, base_path, generic_out_path):
         if not self.type.startswith("."):
             asm_out_dir = Segment.create_split_dir(base_path, os.path.join("asm", "data"))
@@ -215,14 +225,15 @@ class DataSubsegment(Subsegment):
             outpath = Path(os.path.join(asm_out_dir, self.name + f".{self.type}.s"))
             outpath.parent.mkdir(parents=True, exist_ok=True)
 
-            file_text = segment.disassemble_data(self, rom_bytes)
-            if file_text:
+            if self.file_text:
                 with open(outpath, "w", newline="\n") as f:
-                    f.write(file_text)
+                    f.write(self.file_text)
 
 class BssSubsegment(DataSubsegment):
-    def __init__(self, start, end, name, type, vram, args):
-        super().__init__(start, end, name, type, vram, args)
+    def __init__(self, start, end, name, type, vram, args, parent):
+        super().__init__(start, end, name, type, vram, args, parent)
+        self.rom_start = 0
+        self.rom_end = 0
         self.size = self.args[0]
         self.vram_end = self.vram_start + self.size
 
@@ -268,6 +279,7 @@ class N64SegCode(N64Segment):
     def parse_subsegments(self, segment_yaml):
         prefix = self.name if self.name.endswith("/") else f"{self.name}_"
 
+        base_segments = {}
         ret = []
         prev_start = -1
 
@@ -302,13 +314,32 @@ class N64SegCode(N64Segment):
 
             subsegment_class = Subsegment.get_subclass(typ)
 
-            ret.append(subsegment_class(start, end, name, typ, vram, args))
+            if self.rodata_vram_start == -1 and "rodata" in typ:
+                self.rodata_vram_start = vram
+            if self.rodata_vram_end == -1 and "bss" in typ:
+                self.rodata_vram_end = vram
+
+            parent = None
+            if name in base_segments:
+                parent = base_segments[name]
+
+            new_segment = subsegment_class(start, end, name, typ, vram, args, parent)
+            ret.append(new_segment)
+
+            if typ in ["c", "asm", "hasm"]:
+                base_segments[name] = new_segment
+
             prev_start = start
 
+        if self.rodata_vram_start != -1 and self.rodata_vram_end == -1:
+            self.rodata_vram_end = self.vram_end
+
         return ret
 
     def __init__(self, segment, next_segment, options):
         super().__init__(segment, next_segment, options)
+        self.rodata_vram_start = -1
+        self.rodata_vram_end = -1
         self.subsegments = self.parse_subsegments(segment)
         self.is_overlay = segment.get("overlay", False)
         self.all_symbols = ()
@@ -322,6 +353,8 @@ class N64SegCode(N64Segment):
         self.jtbl_jumps = {}
         self.jumptables = {}
 
+        self.rodata_syms = {}
+
     @staticmethod
     def get_default_name(addr):
         return f"code_{addr:X}"
@@ -626,6 +659,12 @@ class N64SegCode(N64Segment):
                                     if offset != 0:
                                         offset_str = f"+0x{offset:X}"
 
+                                if self.rodata_vram_start != -1 and self.rodata_vram_end != -1:
+                                    if self.rodata_vram_start <= sym.vram_start < self.rodata_vram_end:
+                                        if func_addr not in self.rodata_syms:
+                                            self.rodata_syms[func_addr] = []
+                                        self.rodata_syms[func_addr].append(sym)
+
                                 self.update_access_mnemonic(sym, s_insn.mnemonic)
 
                                 sym_label = sym.name + offset_str
@@ -875,6 +914,7 @@ class N64SegCode(N64Segment):
                     ret += "\n\n\n.section .rodata"
 
                 sym_str += self.disassemble_symbol(sym_bytes, stype)
+                sym.disasm_str = sym_str
                 ret += sym_str
 
         ret += "\n"
@@ -927,6 +967,22 @@ class N64SegCode(N64Segment):
             out_lines = self.get_gcc_inc_header()
         else:
             out_lines = []
+
+        if func in self.rodata_syms:
+            func_rodata = list({s for s in self.rodata_syms[func] if s.disasm_str})
+            func_rodata.sort(key=lambda s:s.vram_start)
+
+            if self.get_file_for_addr(func_rodata[0].vram_start).type != "rodata":
+                out_lines.append(".section .rodata")
+
+                for sym in func_rodata:
+                    if sym.disasm_str:
+                        out_lines.extend(sym.disasm_str.replace("\n\n", "\n").split("\n"))
+
+                out_lines.append("")
+                out_lines.append(".section .text")
+                out_lines.append("")
+
         out_lines.extend(funcs_text[func][0])
         out_lines.append("")
 
@@ -956,6 +1012,9 @@ class N64SegCode(N64Segment):
         print(f"Wrote {sub.name} to {c_path}")
 
     def split(self, rom_bytes, base_path):
+        for sub in self.subsegments:
+            sub.scan(self, rom_bytes)
+
         for sub in self.subsegments:
             sub.split(self, rom_bytes, base_path)
 
diff --git a/tools/splat/segtypes/n64/i4.py b/tools/splat/segtypes/n64/i4.py
index 092d50e867..4b597f10f6 100644
--- a/tools/splat/segtypes/n64/i4.py
+++ b/tools/splat/segtypes/n64/i4.py
@@ -23,5 +23,4 @@ class N64SegI4(N64SegRgba16):
         return img
 
     def max_length(self):
-        if self.compressed: return None
         return self.width * self.height // 2
diff --git a/tools/splat/segtypes/n64/i8.py b/tools/splat/segtypes/n64/i8.py
index a3d4abef3d..adbeca3924 100644
--- a/tools/splat/segtypes/n64/i8.py
+++ b/tools/splat/segtypes/n64/i8.py
@@ -6,5 +6,4 @@ class N64SegI8(N64SegI4):
         return data
 
     def max_length(self):
-        if self.compressed: return None
         return self.width * self.height
diff --git a/tools/splat/segtypes/n64/ia16.py b/tools/splat/segtypes/n64/ia16.py
index 2c1025b9e3..07d957165d 100644
--- a/tools/splat/segtypes/n64/ia16.py
+++ b/tools/splat/segtypes/n64/ia16.py
@@ -5,5 +5,4 @@ class N64SegIa8(N64SegIa4):
         return data
 
     def max_length(self):
-        if self.compressed: return None
         return self.width * self.height * 2
diff --git a/tools/splat/segtypes/n64/ia4.py b/tools/splat/segtypes/n64/ia4.py
index 909d9817be..ca285abb14 100644
--- a/tools/splat/segtypes/n64/ia4.py
+++ b/tools/splat/segtypes/n64/ia4.py
@@ -28,5 +28,4 @@ class N64SegIa4(N64SegRgba16):
         return img
 
     def max_length(self):
-        if self.compressed: return None
         return self.width * self.height // 2
diff --git a/tools/splat/segtypes/n64/ia8.py b/tools/splat/segtypes/n64/ia8.py
index e348a2463d..0005abbca7 100644
--- a/tools/splat/segtypes/n64/ia8.py
+++ b/tools/splat/segtypes/n64/ia8.py
@@ -19,5 +19,4 @@ class N64SegIa8(N64SegIa4):
         return img
 
     def max_length(self):
-        if self.compressed: return None
         return self.width * self.height
diff --git a/tools/splat/segtypes/n64/palette.py b/tools/splat/segtypes/n64/palette.py
index f934d2a5d0..73aa7f6052 100644
--- a/tools/splat/segtypes/n64/palette.py
+++ b/tools/splat/segtypes/n64/palette.py
@@ -18,9 +18,6 @@ class N64SegPalette(N64Segment):
         self.image_name = segment.get("image_name", self.name.split(
             ".")[0]) if type(segment) is dict else self.name.split(".")[0]
 
-        self.compressed = segment.get("compressed", False) if type(
-            segment) is dict else False
-
         if self.max_length():
             expected_len = int(self.max_length())
             actual_len = self.rom_end - self.rom_start
@@ -46,8 +43,6 @@ class N64SegPalette(N64Segment):
             out_dir, os.path.basename(self.name) + ".png")
 
         data = rom_bytes[self.rom_start: self.rom_end]
-        if self.compressed:
-            data = Yay0decompress.decompress_yay0(data)
 
         self.palette = N64SegPalette.parse_palette(data)
 
@@ -61,13 +56,9 @@ class N64SegPalette(N64Segment):
         return palette
 
     def max_length(self):
-        if self.compressed:
-            return None
         return 256 * 2
 
     def get_ld_files(self):
         ext = f".{self.type}.png"
-        if self.compressed:
-            ext += ".Yay0"
 
         return [(self.options.get("assets_dir", "img"), f"{self.name}{ext}", ".data", self.rom_start)]
diff --git a/tools/splat/segtypes/n64/rgba16.py b/tools/splat/segtypes/n64/rgba16.py
index d15e1f8d07..e8f11a85ea 100644
--- a/tools/splat/segtypes/n64/rgba16.py
+++ b/tools/splat/segtypes/n64/rgba16.py
@@ -11,14 +11,12 @@ class N64SegRgba16(N64Segment):
         super().__init__(segment, next_segment, options)
 
         if type(segment) is dict:
-            self.compressed = segment.get("compressed", False)
             self.width = segment["width"]
             self.height = segment["height"]
             self.flip = segment.get("flip", "noflip")
         elif len(segment) < 5:
             self.error("missing parameters")
         else:
-            self.compressed = False
             self.width = segment[3]
             self.height = segment[4]
             self.flip = "noflip"
@@ -59,8 +57,6 @@ class N64SegRgba16(N64Segment):
         path = os.path.join(out_dir, os.path.basename(self.name) + ".png")
 
         data = rom_bytes[self.rom_start: self.rom_end]
-        if self.compressed:
-            data = Yay0decompress.decompress_yay0(data)
 
         w = self.png_writer()
         with open(path, "wb") as f:
@@ -80,13 +76,9 @@ class N64SegRgba16(N64Segment):
         return img
 
     def max_length(self):
-        if self.compressed:
-            return None
         return self.width * self.height * 2
 
     def get_ld_files(self):
         ext = f".{self.type}.png"
-        if self.compressed:
-            ext += ".Yay0"
 
         return [(self.options.get("assets_dir", "img"), f"{self.name}{ext}", ".data", self.rom_start)]
diff --git a/tools/splat/segtypes/n64/rgba32.py b/tools/splat/segtypes/n64/rgba32.py
index e13c3b0811..7a885d69d7 100644
--- a/tools/splat/segtypes/n64/rgba32.py
+++ b/tools/splat/segtypes/n64/rgba32.py
@@ -5,5 +5,4 @@ class N64SegRgba32(N64SegRgba16):
         return data
 
     def max_length(self):
-        if self.compressed: return None
         return self.width * self.height * 4
diff --git a/tools/splat/util/symbol.py b/tools/splat/util/symbol.py
index 88a8f103fb..59d4137554 100644
--- a/tools/splat/util/symbol.py
+++ b/tools/splat/util/symbol.py
@@ -47,3 +47,4 @@ class Symbol:
         self.size = size
         self.given_name = given_name
         self.access_mnemonic = None
+        self.disasm_str = None
diff --git a/tools/update_symbol_addrs.py b/tools/update_symbol_addrs.py
index d54f10718e..d85cf47706 100755
--- a/tools/update_symbol_addrs.py
+++ b/tools/update_symbol_addrs.py
@@ -7,11 +7,13 @@ import sys
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 root_dir = script_dir + "/../"
+
+current_ver_dir = script_dir + "/../ver/current/"
 asm_dir = root_dir + "asm/nonmatchings/"
 
-symbol_addrs_path = os.path.join(script_dir, "symbol_addrs.txt")
-elf_path = os.path.join(root_dir, "build", "papermario.elf")
-map_path = os.path.join(root_dir, "build", "papermario.map")
+symbol_addrs_path = os.path.join(current_ver_dir, "symbol_addrs.txt")
+elf_path = os.path.join(current_ver_dir, "build", "papermario.elf")
+map_path = os.path.join(current_ver_dir, "build", "papermario.map")
 ignores_path = os.path.join(root_dir, "tools", "ignored_funcs.txt")
 
 map_symbols = {}
diff --git a/ver/us/asm/data/code_73200.rodata.s b/ver/us/asm/data/code_73200.rodata.s
deleted file mode 100644
index df29d06ced..0000000000
--- a/ver/us/asm/data/code_73200.rodata.s
+++ /dev/null
@@ -1,225 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel D_80097E00
-.double 0.1
-
-glabel D_80097E08
-.double 0.03
-
-glabel D_80097E10
-.double 1.9
-
-glabel D_80097E18
-.double 0.01
-
-glabel D_80097E20
-.byte 0x3F, 0xB9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6C, 0x20, 0x63, 0x6F, 0x68, 0x65, 0x72, 0x65, 0x6E, 0x63, 0x79, 0x20, 0x6F, 0x6E, 0x20, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x57, 0x61, 0x74, 0x63, 0x68, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x46, 0x6C, 0x6F, 0x61, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6C, 0x20, 0x63, 0x6F, 0x68, 0x65, 0x72, 0x65, 0x6E, 0x63, 0x79, 0x20, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x73, 0x74, 0x2E, 0x00, 0x00, 0x54, 0x72, 0x61, 0x70, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x41, 0x72, 0x69, 0x74, 0x68, 0x6D, 0x65, 0x74, 0x69, 0x63, 0x20, 0x6F, 0x76, 0x65, 0x72, 0x66, 0x6C, 0x6F, 0x77, 0x00, 0x43, 0x6F, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x6F, 0x72, 0x20, 0x75, 0x6E, 0x75, 0x73, 0x61, 0x62, 0x6C, 0x65, 0x00, 0x00, 0x00, 0x00, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x42, 0x72, 0x65, 0x61, 0x6B, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x20, 0x63, 0x61, 0x6C, 0x6C, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x42, 0x75, 0x73, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x6F, 0x6E, 0x20, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x42, 0x75, 0x73, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x73, 0x74, 0x2E, 0x00, 0x00, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x6F, 0x6E, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x00, 0x00, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x6F, 0x6E, 0x20, 0x6C, 0x6F, 0x61, 0x64, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x42, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x6E, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x00, 0x00, 0x54, 0x4C, 0x42, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x6E, 0x20, 0x6C, 0x6F, 0x61, 0x64, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x42, 0x20, 0x6D, 0x6F, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x72, 0x75, 0x70, 0x74, 0x00, 0x00, 0x00, 0x49, 0x6E, 0x65, 0x78, 0x61, 0x63, 0x74, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x55, 0x6E, 0x64, 0x65, 0x72, 0x66, 0x6C, 0x6F, 0x77, 0x00, 0x00, 0x00, 0x4F, 0x76, 0x65, 0x72, 0x66, 0x6C, 0x6F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x44, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x62, 0x79, 0x20, 0x7A, 0x65, 0x72, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x49, 0x6E, 0x76, 0x61, 0x6C, 0x69, 0x64, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x55, 0x6E, 0x69, 0x6D, 0x70, 0x6C, 0x65, 0x6D, 0x65, 0x6E, 0x74, 0x65, 0x64, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00
-
-glabel D_80098034
-.ascii "F%02d:%+.3e\0"
-
-glabel D_80098040
-.ascii "F%02d:---------\0"
-
-glabel D_80098050
-.ascii "FPCSR:%08XH\0"
-
-glabel D_8009805C
-.word 0x28257329, 0x00000000
-
-glabel D_80098064
-.ascii "THREAD:%d  (%s)\0"
-
-glabel D_80098074
-.ascii "PC:%08XH   SR:%08XH   VA:%08XH\0\0"
-
-glabel D_80098094
-.ascii "AT:%08XH   V0:%08XH   V1:%08XH\0\0"
-
-glabel D_800980B4
-.ascii "A0:%08XH   A1:%08XH   A2:%08XH\0\0"
-
-glabel D_800980D4
-.ascii "A3:%08XH   T0:%08XH   T1:%08XH\0\0"
-
-glabel D_800980F4
-.ascii "T2:%08XH   T3:%08XH   T4:%08XH\0\0"
-
-glabel D_80098114
-.ascii "T5:%08XH   T6:%08XH   T7:%08XH\0\0"
-
-glabel D_80098134
-.ascii "S0:%08XH   S1:%08XH   S2:%08XH\0\0"
-
-glabel D_80098154
-.ascii "S3:%08XH   S4:%08XH   S5:%08XH\0\0"
-
-glabel D_80098174
-.ascii "S6:%08XH   S7:%08XH   T8:%08XH\0\0"
-
-glabel D_80098194
-.ascii "T9:%08XH   GP:%08XH   SP:%08XH\0\0"
-
-glabel D_800981B4
-.ascii "S8:%08XH   RA:%08XH\0"
-
-glabel D_800981C8
-.word 0x4D4D3A25, 0x30385848, 0x00000000, 0x00000000, 0x00000000, 0x00000000
-
-glabel jtbl_800981E0
-.word L8002D4A8_88A8, L8002D4B8_88B8, L8002D4C8_88C8, L8002D498_8898, L8002D4D8_88D8, L8002D4E8_88E8, L8002D4F8_88F8, 0
-
-glabel D_80098200
-.double 0.01
-
-glabel D_80098208
-.double -0.01
-
-glabel jtbl_80098210
-.word L800305B0_B9B0, L80030768_BB68, L80030868_BC68, L80030874_BC74, L80030880_BC80, L80030868_BC68, L80030644_BA44, 0
-
-glabel jtbl_80098230
-.word L800308D0_BCD0, L80030BFC_BFFC, L80030E54_C254, L80031210_C610, L80031220_C620, L8003106C_C46C, L800309CC_BDCC, 0
-
-glabel D_80098250
-.double 1.01
-
-glabel D_80098258
-.double 0.3
-
-glabel D_80098260
-.double 0.2
-
-glabel D_80098268
-.double 3.141592
-
-glabel D_80098270
-.double 0.5001
-
-glabel D_80098278
-.double 0.01
-
-glabel D_80098280
-.double 0.1
-
-glabel D_80098288
-.double -0.1
-
-glabel jtbl_80098290
-.word L800341F8_F5F8, L8003411C_F51C, L80034150_F550, L80034170_F570, L800341A8_F5A8, L800341D8_F5D8, L800341F8_F5F8, L80034230_F630, L80034278_F678, L800342D4_F6D4, L800342FC_F6FC, L8003432C_F72C
-
-glabel jtbl_800982C0
-.word L800344A8_F8A8, L800344A8_F8A8, L800344A8_F8A8, L80034628_FA28, L80034628_FA28, L80034628_FA28, L800347A8_FBA8, L800347A8_FBA8, L800347A8_FBA8, L800347A8_FBA8
-
-glabel jtbl_800982E8
-.word L80035740_10B40, L800357A4_10BA4, L80035814_10C14, L80035A68_10E68, L80035AE0_10EE0, 0
-
-glabel jtbl_80098300
-.word L80035B7C_10F7C, L80035BDC_10FDC, L80035C10_11010, L80035C2C_1102C, L80035C80_11080, L80035CCC_110CC, L80035D00_11100, 0
-
-glabel jtbl_80098320
-.word L800361B4_115B4, L80036208_11608, L80036244_11644, L800362F8_116F8, L8003637C_1177C, 0
-
-glabel jtbl_80098338
-.word L8003696C_11D6C, L80036A20_11E20, L80036AA0_11EA0, L80036C40_12040, L80036D04_12104, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036A5C_11E5C
-
-glabel D_80098390
-.ascii "title_data\0\0"
-
-glabel D_8009839C
-.word 0x7469746C, 0x655F6267, 0x00000000
-
-glabel jtbl_800983A8
-.word L80037130_12530, L80037184_12584, L80037204_12604, L8003756C_1296C, L800372DC_126DC, L8003733C_1273C, L80037450_12850, 0
-
-glabel jtbl_800983C8
-.word L800375D8_129D8, L80037624_12A24, L800375F4_129F4, L8003762C_12A2C, L80037624_12A24, L80037624_12A24
-
-glabel jtbl_800983E0
-.word L80037718_12B18, L8003768C_12A8C, L800376BC_12ABC, L80037718_12B18, L800376C8_12AC8, L800376D4_12AD4, 0x656E6400, 0x6B6B6A5F, 0x32360000, 0x61726E5F, 0x30380000, 0x6B6B6A5F, 0x31310000, 0x6E6F6B5F, 0x30320000, 0x6D61635F, 0x30330000, 0x6B7A6E5F, 0x30320000, 0x6D61635F, 0x30300000, 0x6A616E5F, 0x30340000, 0x7472645F, 0x30390000, 0x74696B5F, 0x30330000, 0x69736B5F, 0x30340000, 0x6E6F6B5F, 0x31320000, 0
-
-glabel jtbl_80098460
-.word L80038320_13720, L8003836C_1376C, L8003840C_1380C, L8003817C_1357C, L800381C8_135C8, 0, 0, 0
-
-glabel D_80098480
-.double 0.7142857142857143
-
-glabel D_80098488
-.double 0.7142857142857143
-
-glabel D_80098490
-.double 0.7142857142857143
-
-glabel D_80098498
-.double 0.7142857142857143
-
-glabel D_800984A0
-.double 0.7142857142857143
-
-glabel D_800984A8
-.double 0.7142857142857143
-
-glabel D_800984B0
-.double 0.01
-
-glabel D_800984B8
-.double -0.01
-
-glabel D_800984C0
-.double 0.7142857142857143
-
-glabel jtbl_800984C8
-.word L8003B4AC_168AC, L8003B4BC_168BC, L8003B4CC_168CC, L8003B4DC_168DC, L8003B4EC_168EC, 0
-
-glabel D_800984E0
-.word 0x8003C490, 0x8003C4A4, 0x8003C4B8, 0x8003C4CC, 0x8003C4E0, 0x8003C4F4, 0x8003C508, 0x00000000
-
-glabel jtbl_80098500
-.word L8003C57C_1797C, L8003C590_17990, L8003C5A4_179A4, L8003C5B8_179B8, L8003C5CC_179CC, L8003C5E0_179E0, L8003C5F4_179F4, 0
-
-glabel D_80098520
-.double 0.01
-
-glabel D_80098528
-.double 0.8
-
-glabel D_80098530
-.double 0.20000000298023224
-
-glabel D_80098538
-.double 0.8
-
-glabel D_80098540
-.double 0.20000000298023224
-
-glabel jtbl_80098548
-.word L8003D43C_1883C, L8003D46C_1886C, L8003D464_18864, L8003D464_18864, L8003D48C_1888C, L8003D54C_1894C, L8003D4A8_188A8, L8003D4C8_188C8, L8003D4F4_188F4, L8003D510_18910, L8003D530_18930, L8003D5FC_189FC, L8003D5FC_189FC, L8003D568_18968, L8003D584_18984, L8003D5A4_189A4, L8003D5D0_189D0, 0
-
-glabel jtbl_80098590
-.word L8003D750_18B50, L8003D764_18B64, L8003D764_18B64, L8003D764_18B64, L8003D764_18B64, L8003D6E8_18AE8, L8003D6FC_18AFC, L8003D710_18B10, L8003D73C_18B3C, 0, 0, 0
-
-glabel jtbl_800985C0
-.word L8003E59C_1999C, L8003E554_19954, L8003E564_19964, L8003E574_19974, L8003E584_19984, L8003E594_19994
-
-glabel jtbl_800985D8
-.word L8003E628_19A28, L8003E5E0_199E0, L8003E5F0_199F0, L8003E600_19A00, L8003E610_19A10, L8003E620_19A20
-
-glabel D_800985F0
-.double 0.35
-
-glabel jtbl_800985F8
-.word L80040320_1B720, L80040320_1B720, L80040594_1B994, L80040594_1B994, L80040594_1B994, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040594_1B994, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040594_1B994, L8003FFA0_1B3A0
-
-glabel jtbl_80098638
-.word L80040540_1B940, L80040540_1B940, L8004055C_1B95C, L8004055C_1B95C, L8004055C_1B95C, L80040540_1B940, L80040540_1B940, L80040540_1B940, L80040540_1B940, L8004055C_1B95C, L80040548_1B948, L80040548_1B948, L80040554_1B954, L80040554_1B954
-
-glabel D_80098670
-.double 0.8
-
-glabel jtbl_80098678
-.word L80041314_1C714, L80040918_1BD18, L80040BF4_1BFF4, L80040ABC_1BEBC, L80040E34_1C234, L800410BC_1C4BC, L8004115C_1C55C, 0
-
-glabel jtbl_80098698
-.word L80042198_1D598, L800421AC_1D5AC, L800421C0_1D5C0, L800421E8_1D5E8, L800421D4_1D5D4, 0
diff --git a/ver/us/asm/data/code_74EA0.rodata.s b/ver/us/asm/data/code_74EA0.rodata.s
deleted file mode 100644
index a90acc7adf..0000000000
--- a/ver/us/asm/data/code_74EA0.rodata.s
+++ /dev/null
@@ -1,108 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-glabel D_80099AA0
-.short 0x0555, 0x0556, 0x0559, 0x055A, 0x0565, 0x0566, 0x0569, 0x056A, 0x0595, 0x0596, 0x0599, 0x059A, 0x05A5, 0x05A6, 0x05A9, 0x05AA, 0x0655, 0x0656, 0x0659, 0x065A, 0x0665, 0x0666, 0x0669, 0x066A, 0x0695, 0x0696, 0x0699, 0x069A, 0x06A5, 0x06A6, 0x06A9, 0x06AA, 0x0955, 0x0956, 0x0959, 0x095A, 0x0965, 0x0966, 0x0969, 0x096A, 0x0995, 0x0996, 0x0999, 0x099A, 0x09A5, 0x09A6, 0x09A9, 0x09AA, 0x0A55, 0x0A56, 0x0A59, 0x0A5A, 0x0A65, 0x0A66, 0x0A69, 0x0A6A, 0x0A95, 0x0A96, 0x0A99, 0x0A9A, 0x0AA5, 0x0AA6, 0x0AA9, 0x0AAA
-
-glabel jtbl_80099B20
-.word L800613D4_3C7D4, L800612F4_3C6F4, L80061328_3C728, L800613E4_3C7E4, L800613E4_3C7E4, L8006135C_3C75C, L80061398_3C798, 0
-
-glabel D_80099B40
-.double 4294967296.0, 0.0
-
-glabel D_80099B50
-.double -1.0
-
-glabel D_80099B58
-.word 0x3FF00000, 0x00000000
-
-glabel D_80099B60
-.double -1.0
-
-glabel D_80099B68
-.word 0x3FF00000, 0x00000000
-
-glabel D_80099B70
-.double -1.0
-
-glabel D_80099B78
-.double 1.0
-
-glabel D_80099B80
-.double 0.1
-
-glabel D_80099B88
-.double 1.0
-
-glabel D_80099B90
-.double 0.1, 0.0
-
-glabel D_80099BA0
-.double -1.0
-
-glabel D_80099BA8
-.word 0x3FF00000, 0x00000000
-
-glabel D_80099BB0
-.double 0.017453292222222222
-
-glabel D_80099BB8
-.double 2.0
-
-glabel D_80099BC0
-.double 131072.0
-
-glabel D_80099BC8
-.double 2147483648.0
-
-glabel D_80099BD0
-.double 0.017453292222222222
-
-glabel D_80099BD8
-.double 2.0
-
-glabel D_80099BE0
-.double 131072.0
-
-glabel D_80099BE8
-.double 2147483648.0
-
-glabel D_80099BF0
-.word 0x202B2D23, 0x30000000
-
-glabel D_80099BF8
-.word 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 0x00000000
-
-glabel D_80099C10
-.word 0x686C4C00, 0x00000000
-
-glabel jtbl_80099C18
-.word L800654B0_408B0, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800652CC_406CC, L800654CC_408CC, L800652CC_406CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800651B4_405B4, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L80065080_40480, L800650B4_404B4, L800652CC_406CC, L800652CC_406CC, L800652CC_406CC, L800654CC_408CC, L800650B4_404B4, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L80065380_40780, L800651B4_405B4, L80065420_40820, L800654CC_408CC, L800654CC_408CC, L8006546C_4086C, L800654CC_408CC, L800651B4_405B4, L800654CC_408CC, L800654CC_408CC, L800651B4_405B4, 0, 0
-
-glabel D_80099D70
-.double 4294967296.0, 0.0
-
-glabel jtbl_80099D80
-.word 0x141818, 0x1C1C1C1C, 0x20202020, 0x20202020, 0x40808, 0xC0C0C0C, 0x10101010, 0x10101010
-
-glabel jtbl_80099DA0
-.word L8006AF00_46300, L8006AEC4_462C4, L8006AEA0_462A0, L8006ACC8_460C8, L8006AC80_46080, L8006AE3C_4623C, L8006AC44_46044, L8006AC50_46050, L8006AC5C_4605C, 0, 0, 0
-
-glabel D_80099DD0
-.word 0x40240000, 0x00000000, 0x40590000, 0x00000000, 0x40C38800, 0x00000000, 0x4197D784, 0x00000000, 0x4341C379, 0x37E08000, 0x4693B8B5, 0xB5056E17, 0x4D384F03, 0xE93FF9F5, 0x5A827748, 0xF9301D32, 0x75154FDD, 0x7F73BF3C
-
-glabel D_80099E18
-.word 0x4E614E00
-
-glabel D_80099E1C
-.word 0x496E6600
-
-glabel D_80099E20
-.double 1.0
-
-glabel D_80099E28
-.double 100000000.0
-
-glabel D_80099E30
-.word 0x30000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/code_917EC.data.s b/ver/us/asm/data/code_917F8.data.s
similarity index 99%
rename from ver/us/asm/data/code_917EC.data.s
rename to ver/us/asm/data/code_917F8.data.s
index e97568ebb5..e3497d3553 100644
--- a/ver/us/asm/data/code_917EC.data.s
+++ b/ver/us/asm/data/code_917F8.data.s
@@ -2,15 +2,6 @@
 
 .section .data
 
-glabel D_800F833C
-.word 0x00000000
-
-glabel D_800F8340
-.word 0x00000000
-
-glabel D_800F8344
-.word 0x00000000
-
 glabel gPartnerAnimations
 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00010002, 0x00010004, 0x00010005, 0x00010001, 0x00010001, 0x00010003, 0x00010008, 0x00010007, 0x00020000, 0x00020004, 0x00020006, 0x00020007, 0x00020000, 0x00020003, 0x00020005, 0x0002000D, 0x0002000C, 0x00030000, 0x00030005, 0x00030009, 0x0003000A, 0x00030000, 0x00030003, 0x00030007, 0x0003000E, 0x0003000D, 0x00040000, 0x00040002, 0x00040008, 0x00040002, 0x00040002, 0x00040001, 0x00040003, 0x00040006, 0x00040005, 0x009D0000, 0x009D0002, 0x009D0004, 0x009D0005, 0x009D0001, 0x009D0001, 0x009D0003, 0x009D0008, 0x009D0001, 0x00060000, 0x00060002, 0x00060002, 0x00060002, 0x00060000, 0x00060001, 0x00060003, 0x00060004, 0x00060007, 0x00070000, 0x00070002, 0x00070002, 0x00070002, 0x00070000, 0x00070001, 0x00070003, 0x00070004, 0x00070008, 0x00080000, 0x00080005, 0x00080005, 0x00080005, 0x00080000, 0x00080001, 0x00080007, 0x00080009, 0x0008000A, 0x00050000, 0x00050002, 0x00050002, 0x00050002, 0x00050000, 0x00050001, 0x00050003, 0x00050004, 0x0005000C, 0x009E0000, 0x009E0005, 0x009E0012, 0x009E0013, 0x009E0001, 0x009E0001, 0x009E0007, 0x009E000B, 0x009E0001, 0x00200000, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200001, 0x00200009, 0x00200020
 
diff --git a/ver/us/asm/data/code_fee30_len_2d60.data.s b/ver/us/asm/data/code_fee30_len_2d60.data.s
deleted file mode 100644
index a7f603f422..0000000000
--- a/ver/us/asm/data/code_fee30_len_2d60.data.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-glabel D_802DF390
-.word 0xFFF00038, 0x00000000, 0x00000000, 0xF0F0F0FF, 0x00100038, 0x00000000, 0x04000000, 0x787878FF, 0x00100000, 0x00000000, 0x04000700, 0x000000FF, 0xFFF00000, 0x00000000, 0x00000700, 0x787878FF
-
-glabel D_802DF3D0
-.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000
-
-glabel D_802DF3E0
-.word 0x028001E0, 0x01FF0000, 0x028001E0, 0x02000000
-
-glabel D_802DF3F0
-.word 0xD9FDF9FF, 0x00000000, 0xFCFFFFFF, 0xFFFCF279, 0xD7000002, 0xFFFFFFFF, 0xD9FFFFFF, 0x00200005, 0xE200001C, 0x00551238, 0xE3000A11, 0x0008ACF0, 0xDF000000, 0x00000000
-
-glabel D_802DF428
-.word 0xD9FDF9FF, 0x00000000, 0xFCFF97FF, 0xFF2CFE7F, 0xD7000002, 0xFFFFFFFF, 0xD9FFFFFF, 0x00200005, 0xE200001C, 0x00504B50, 0xE3000A11, 0x0008ACF0, 0xDF000000, 0x00000000
-
-glabel D_802DF460
-.word 0xD9FDF9FF, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xD9FFFFFF, 0x00200005, 0xE200001C, 0x0C191238, 0xE3000A11, 0x0018ACF0, 0xDF000000, 0x00000000
-
-glabel D_802DF490
-.word 0xD9FDF9FF, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xD9FFFFFF, 0x00200005, 0xE200001C, 0x0C184B50, 0xE3000A11, 0x0018ACF0, 0xDF000000, 0x00000000
-
-glabel D_802DF4C0
-.float 1.0
-
-glabel D_802DF4C4
-.word 0x00000006, 0x00000700, 0x000003C6, 0x00000012, 0x00000700, 0x000003C6, 0x0000000A, 0x00000900, 0x00003FC6, 0x00000003, 0x00000700, 0x00000006, 0x00000006, 0x00000900, 0x00003C00, 0x00000006, 0x00000700, 0x0000003E, 0x00000006, 0x00000900, 0x00003C00, 0x00000000, 0x00000000
diff --git a/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035704.s b/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035704.s
index 84ceb7eb36..40a76ef136 100644
--- a/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035704.s
+++ b/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035704.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800982E8
+.word L80035740_10B40, L800357A4_10BA4, L80035814_10C14, L80035A68_10E68, L80035AE0_10EE0, 0
+
+.section .text
+
 glabel func_80035704
 /* 10B04 80035704 3C03800A */  lui       $v1, %hi(D_800A0931)
 /* 10B08 80035708 80630931 */  lb        $v1, %lo(D_800A0931)($v1)
diff --git a/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035B40.s b/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035B40.s
index 33d79e49be..6988e1ab5a 100644
--- a/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035B40.s
+++ b/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035B40.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098300
+.word L80035B7C_10F7C, L80035BDC_10FDC, L80035C10_11010, L80035C2C_1102C, L80035C80_11080, L80035CCC_110CC, L80035D00_11100, 0
+
+.section .text
+
 glabel func_80035B40
 /* 10F40 80035B40 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 10F44 80035B44 AFBF0014 */  sw        $ra, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/code_111f0_len_860/func_8003617C.s b/ver/us/asm/nonmatchings/code_111f0_len_860/func_8003617C.s
index ce51dff2ef..19d0dfe56f 100644
--- a/ver/us/asm/nonmatchings/code_111f0_len_860/func_8003617C.s
+++ b/ver/us/asm/nonmatchings/code_111f0_len_860/func_8003617C.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098320
+.word L800361B4_115B4, L80036208_11608, L80036244_11644, L800362F8_116F8, L8003637C_1177C, 0
+
+.section .text
+
 glabel func_8003617C
 /* 1157C 8003617C 3C03800A */  lui       $v1, %hi(D_800A0944)
 /* 11580 80036180 84630944 */  lh        $v1, %lo(D_800A0944)($v1)
diff --git a/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s b/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s
index 224d62bc1d..50f0cbc88a 100644
--- a/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s
+++ b/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098338
+.word L8003696C_11D6C, L80036A20_11E20, L80036AA0_11EA0, L80036C40_12040, L80036D04_12104, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036D78_12178, L80036A5C_11E5C
+
+.section .text
+
 glabel step_intro
 /* 11C54 80036854 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 11C58 80036858 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s
index 6efab80db8..d6ca97acce 100644
--- a/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s
+++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098390
+.ascii "title_data\0\0"
+
+glabel D_8009839C
+.word 0x7469746C, 0x655F6267, 0x00000000
+
+.section .text
+
 glabel begin_state_title_screen
 /* 121F0 80036DF0 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 121F4 80036DF4 AFB20028 */  sw        $s2, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s
index ac7d9f5170..9ad81b1ef3 100644
--- a/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s
+++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800983C8
+.word L800375D8_129D8, L80037624_12A24, L800375F4_129F4, L8003762C_12A2C, L80037624_12A24, L80037624_12A24
+
+.section .text
+
 glabel func_800375A4
 /* 129A4 800375A4 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* 129A8 800375A8 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s
index 75f4c5d58c..58d325e2a8 100644
--- a/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s
+++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800983A8
+.word L80037130_12530, L80037184_12584, L80037204_12604, L8003756C_1296C, L800372DC_126DC, L8003733C_1273C, L80037450_12850, 0
+
+.section .text
+
 glabel step_title_screen
 /* 124B4 800370B4 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 124B8 800370B8 AFB00018 */  sw        $s0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s b/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s
index 4f187bc3b6..05a9d40e30 100644
--- a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s
+++ b/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800983E0
+.word L80037718_12B18, L8003768C_12A8C, L800376BC_12ABC, L80037718_12B18, L800376C8_12AC8, L800376D4_12AD4, 0x656E6400, 0x6B6B6A5F, 0x32360000, 0x61726E5F, 0x30380000, 0x6B6B6A5F, 0x31310000, 0x6E6F6B5F, 0x30320000, 0x6D61635F, 0x30330000, 0x6B7A6E5F, 0x30320000, 0x6D61635F, 0x30300000, 0x6A616E5F, 0x30340000, 0x7472645F, 0x30390000, 0x74696B5F, 0x30330000, 0x69736B5F, 0x30340000, 0x6E6F6B5F, 0x31320000, 0
+
+.section .text
+
 glabel title_append_gfx
 /* 12A38 80037638 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
 /* 12A3C 8003763C 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
diff --git a/ver/us/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s b/ver/us/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s
index 6bcfafe651..45cacc8e69 100644
--- a/ver/us/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s
+++ b/ver/us/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098460
+.word L80038320_13720, L8003836C_1376C, L8003840C_1380C, L8003817C_1357C, L800381C8_135C8, 0, 0, 0
+
+.section .text
+
 glabel next_demo_scene
 /* 134F4 800380F4 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 134F8 800380F8 3C058007 */  lui       $a1, %hi(gGameStatusPtr)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/appedGfx_npc_blur.s b/ver/us/asm/nonmatchings/code_13870_len_6980/appedGfx_npc_blur.s
index d4fc35cdfb..08547d6807 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/appedGfx_npc_blur.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/appedGfx_npc_blur.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_800984C0
+.double 0.7142857142857143
+
+.section .text
+
 glabel appedGfx_npc_blur
 /* 16238 8003AE38 27BDFF08 */  addiu     $sp, $sp, -0xf8
 /* 1623C 8003AE3C F7BC00E8 */  sdc1      $f28, 0xe8($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s b/ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s
index a6456a7deb..95e6b83e15 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s
@@ -1,6 +1,28 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098480
+.double 0.7142857142857143
+
+glabel D_80098488
+.double 0.7142857142857143
+
+glabel D_80098490
+.double 0.7142857142857143
+
+glabel D_80098498
+.double 0.7142857142857143
+
+glabel D_800984A0
+.double 0.7142857142857143
+
+glabel D_800984A8
+.double 0.7142857142857143
+
+.section .text
+
 glabel appendGfx_npc
 /* 153D0 80039FD0 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 153D4 80039FD4 AFB1009C */  sw        $s1, 0x9c($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s b/ver/us/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s
index f22ba46f47..221a5fb9e5 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/draw_encounter_ui.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800985D8
+.word L8003E628_19A28, L8003E5E0_199E0, L8003E5F0_199F0, L8003E600_19A00, L8003E610_19A10, L8003E620_19A20
+
+.section .text
+
 glabel draw_encounter_ui
 /* 199B0 8003E5B0 3C03800A */  lui       $v1, %hi(gGameState)
 /* 199B4 8003E5B4 8C63A600 */  lw        $v1, %lo(gGameState)($v1)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s
index d4ee18a931..8abd635bcc 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800984C8
+.word L8003B4AC_168AC, L8003B4BC_168BC, L8003B4CC_168CC, L8003B4DC_168DC, L8003B4EC_168EC, 0
+
+.section .text
+
 glabel func_8003B47C
 /* 1687C 8003B47C 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 16880 8003B480 AFBF0010 */  sw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C444.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C444.s
index 16567574af..525ca66839 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C444.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C444.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_800984E0
+.word 0x8003C490, 0x8003C4A4, 0x8003C4B8, 0x8003C4CC, 0x8003C4E0, 0x8003C4F4, 0x8003C508, 0x00000000
+
+.section .text
+
 glabel func_8003C444
 /* 17844 8003C444 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 17848 8003C448 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s
index 7f682c2d33..2e8cdbc4fb 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098500
+.word L8003C57C_1797C, L8003C590_17990, L8003C5A4_179A4, L8003C5B8_179B8, L8003C5CC_179CC, L8003C5E0_179E0, L8003C5F4_179F4, 0
+
+.section .text
+
 glabel func_8003C53C
 /* 1793C 8003C53C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 17940 8003C540 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C668.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C668.s
index 3b8eda4374..449a2367f9 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C668.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C668.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098520
+.double 0.01
+
+.section .text
+
 glabel func_8003C668
 /* 17A68 8003C668 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 17A6C 8003C66C AFB00018 */  sw        $s0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s
index bcdc6cc6c1..0a5a058f24 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098528
+.double 0.8
+
+glabel D_80098530
+.double 0.20000000298023224
+
+glabel D_80098538
+.double 0.8
+
+glabel D_80098540
+.double 0.20000000298023224
+
+.section .text
+
 glabel func_8003C9A8
 /* 17DA8 8003C9A8 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 17DAC 8003C9AC AFB00018 */  sw        $s0, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s
index 0e53c2497b..cd7465891a 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098548
+.word L8003D43C_1883C, L8003D46C_1886C, L8003D464_18864, L8003D464_18864, L8003D48C_1888C, L8003D54C_1894C, L8003D4A8_188A8, L8003D4C8_188C8, L8003D4F4_188F4, L8003D510_18910, L8003D530_18930, L8003D5FC_189FC, L8003D5FC_189FC, L8003D568_18968, L8003D584_18984, L8003D5A4_189A4, L8003D5D0_189D0, 0
+
+.section .text
+
 glabel func_8003D3BC
 /* 187BC 8003D3BC 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* 187C0 8003D3C0 AFB10024 */  sw        $s1, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s
index 0e6e0dd651..a2a3f24ad3 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098590
+.word L8003D750_18B50, L8003D764_18B64, L8003D764_18B64, L8003D764_18B64, L8003D764_18B64, L8003D6E8_18AE8, L8003D6FC_18AFC, L8003D710_18B10, L8003D73C_18B3C, 0, 0, 0
+
+.section .text
+
 glabel func_8003D660
 /* 18A60 8003D660 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 18A64 8003D664 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s b/ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s
index 3e91fe0826..710e6b9fca 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s
@@ -156,8 +156,8 @@ glabel npc_do_player_collision
 /* 14924 80039524 C6020028 */  lwc1      $f2, 0x28($s0)
 /* 14928 80039528 46161081 */  sub.s     $f2, $f2, $f22
 /* 1492C 8003952C C6000030 */  lwc1      $f0, 0x30($s0)
-/* 14930 80039530 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* 14934 80039534 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* 14930 80039530 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* 14934 80039534 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* 14938 80039538 46140001 */  sub.s     $f0, $f0, $f20
 /* 1493C 8003953C E6020028 */  swc1      $f2, 0x28($s0)
 /* 14940 80039540 E6000030 */  swc1      $f0, 0x30($s0)
@@ -177,8 +177,8 @@ glabel npc_do_player_collision
 /* 14974 80039574 C6020028 */  lwc1      $f2, 0x28($s0)
 /* 14978 80039578 46061081 */  sub.s     $f2, $f2, $f6
 /* 1497C 8003957C C6000030 */  lwc1      $f0, 0x30($s0)
-/* 14980 80039580 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* 14984 80039584 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* 14980 80039580 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* 14984 80039584 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* 14988 80039588 46040001 */  sub.s     $f0, $f0, $f4
 /* 1498C 8003958C E6020028 */  swc1      $f2, 0x28($s0)
 /* 14990 80039590 E6000030 */  swc1      $f0, 0x30($s0)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/render_npcs.s b/ver/us/asm/nonmatchings/code_13870_len_6980/render_npcs.s
index be763ac3fe..7942b128a8 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/render_npcs.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/render_npcs.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_800984B0
+.double 0.01
+
+glabel D_800984B8
+.double -0.01
+
+.section .text
+
 glabel render_npcs
 /* 15BF0 8003A7F0 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 15BF4 8003A7F4 F7BA0080 */  sdc1      $f26, 0x80($sp)
diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/update_counters.s b/ver/us/asm/nonmatchings/code_13870_len_6980/update_counters.s
index b9f3bbd178..947fc946b5 100644
--- a/ver/us/asm/nonmatchings/code_13870_len_6980/update_counters.s
+++ b/ver/us/asm/nonmatchings/code_13870_len_6980/update_counters.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800985C0
+.word L8003E59C_1999C, L8003E554_19954, L8003E564_19964, L8003E574_19974, L8003E584_19984, L8003E594_19994
+
+.section .text
+
 glabel update_counters
 /* 19924 8003E524 3C03800A */  lui       $v1, %hi(gGameState)
 /* 19928 8003E528 8C63A600 */  lw        $v1, %lo(gGameState)($v1)
diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s
index c3c3ab46db..1daa8d4390 100644
--- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s
+++ b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_800985F0
+.double 0.35
+
+.section .text
+
 glabel MerleeUpdateFX
 /* 1A4C4 8003F0C4 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 1A4C8 8003F0C8 AFB20020 */  sw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s
index 1004a43f80..55900a1fa5 100644
--- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s
+++ b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800985F8
+.word L80040320_1B720, L80040320_1B720, L80040594_1B994, L80040594_1B994, L80040594_1B994, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040594_1B994, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040320_1B720, L80040594_1B994, L8003FFA0_1B3A0
+
+glabel jtbl_80098638
+.word L80040540_1B940, L80040540_1B940, L8004055C_1B95C, L8004055C_1B95C, L8004055C_1B95C, L80040540_1B940, L80040540_1B940, L80040540_1B940, L80040540_1B940, L8004055C_1B95C, L80040548_1B948, L80040548_1B948, L80040554_1B954, L80040554_1B954
+
+glabel D_80098670
+.double 0.8
+
+glabel jtbl_80098678
+.word L80041314_1C714, L80040918_1BD18, L80040BF4_1BFF4, L80040ABC_1BEBC, L80040E34_1C234, L800410BC_1C4BC, L8004115C_1C55C, 0
+
+.section .text
+
 glabel update_encounters_neutral
 /* 1ABCC 8003F7CC 27BDFF40 */  addiu     $sp, $sp, -0xc0
 /* 1ABD0 8003F7D0 AFB30074 */  sw        $s3, 0x74($sp)
@@ -420,8 +436,8 @@ glabel update_encounters_neutral
 /* 1B1E8 8003FDE8 30820040 */  andi      $v0, $a0, 0x40
 /* 1B1EC 8003FDEC 144002B6 */  bnez      $v0, .L800408C8
 /* 1B1F0 8003FDF0 24020009 */   addiu    $v0, $zero, 9
-/* 1B1F4 8003FDF4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* 1B1F8 8003FDF8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* 1B1F4 8003FDF4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* 1B1F8 8003FDF8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* 1B1FC 8003FDFC 106202B2 */  beq       $v1, $v0, .L800408C8
 /* 1B200 8003FE00 00000000 */   nop
 /* 1B204 8003FE04 8E220000 */  lw        $v0, ($s1)
diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s
index 26ac5ec01b..052b2ef3ce 100644
--- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s
+++ b/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098698
+.word L80042198_1D598, L800421AC_1D5AC, L800421C0_1D5C0, L800421E8_1D5E8, L800421D4_1D5D4, 0
+
+.section .text
+
 glabel update_encounters_post_battle
 /* 1D310 80041F10 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 1D314 80041F14 AFB60028 */  sw        $s6, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/code_23680/DoBasicAI.s b/ver/us/asm/nonmatchings/code_23680/DoBasicAI.s
index 8d806a36b4..a1472742f9 100644
--- a/ver/us/asm/nonmatchings/code_23680/DoBasicAI.s
+++ b/ver/us/asm/nonmatchings/code_23680/DoBasicAI.s
@@ -104,7 +104,7 @@ glabel DoBasicAI
 .L8004A5D8:
 /* 259D8 8004A5D8 8E430070 */  lw        $v1, 0x70($s2)
 /* 259DC 8004A5DC 2C620064 */  sltiu     $v0, $v1, 0x64
-/* 259E0 8004A5E0 10400038 */  beqz      $v0, .L8004A6C4
+/* 259E0 8004A5E0 10400038 */  beqz      $v0, L8004A6C4_25AC4
 /* 259E4 8004A5E4 00031080 */   sll      $v0, $v1, 2
 /* 259E8 8004A5E8 3C01800A */  lui       $at, %hi(jtbl_80098728)
 /* 259EC 8004A5EC 00220821 */  addu      $at, $at, $v0
@@ -159,7 +159,7 @@ glabel L8004A684_25A84
 /* 25A90 8004A690 0280302D */   daddu    $a2, $s4, $zero
 /* 25A94 8004A694 8E430070 */  lw        $v1, 0x70($s2)
 /* 25A98 8004A698 2402000E */  addiu     $v0, $zero, 0xe
-/* 25A9C 8004A69C 14620009 */  bne       $v1, $v0, .L8004A6C4
+/* 25A9C 8004A69C 14620009 */  bne       $v1, $v0, L8004A6C4_25AC4
 /* 25AA0 8004A6A0 00000000 */   nop
 glabel L8004A6A4_25AA4
 /* 25AA4 8004A6A4 0240202D */  daddu     $a0, $s2, $zero
@@ -171,7 +171,6 @@ glabel L8004A6A4_25AA4
 glabel L8004A6BC_25ABC
 /* 25ABC 8004A6BC 0C0129CF */  jal       func_8004A73C
 /* 25AC0 8004A6C0 0240202D */   daddu    $a0, $s2, $zero
-.L8004A6C4:
 glabel L8004A6C4_25AC4
 /* 25AC4 8004A6C4 8FBF0048 */  lw        $ra, 0x48($sp)
 /* 25AC8 8004A6C8 8FB50044 */  lw        $s5, 0x44($sp)
diff --git a/ver/us/asm/nonmatchings/code_6e40_len_500/render_curtains.s b/ver/us/asm/nonmatchings/code_6e40_len_500/render_curtains.s
index 7d1c437295..236b200237 100644
--- a/ver/us/asm/nonmatchings/code_6e40_len_500/render_curtains.s
+++ b/ver/us/asm/nonmatchings/code_6e40_len_500/render_curtains.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80097E00
+.double 0.1
+
+glabel D_80097E08
+.double 0.03
+
+glabel D_80097E10
+.double 1.9
+
+glabel D_80097E18
+.double 0.01
+
+glabel D_80097E20
+.byte 0x3F, 0xB9, 0x99, 0x99, 0x99, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6C, 0x20, 0x63, 0x6F, 0x68, 0x65, 0x72, 0x65, 0x6E, 0x63, 0x79, 0x20, 0x6F, 0x6E, 0x20, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x57, 0x61, 0x74, 0x63, 0x68, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x46, 0x6C, 0x6F, 0x61, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6C, 0x20, 0x63, 0x6F, 0x68, 0x65, 0x72, 0x65, 0x6E, 0x63, 0x79, 0x20, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x73, 0x74, 0x2E, 0x00, 0x00, 0x54, 0x72, 0x61, 0x70, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x41, 0x72, 0x69, 0x74, 0x68, 0x6D, 0x65, 0x74, 0x69, 0x63, 0x20, 0x6F, 0x76, 0x65, 0x72, 0x66, 0x6C, 0x6F, 0x77, 0x00, 0x43, 0x6F, 0x70, 0x72, 0x6F, 0x63, 0x65, 0x73, 0x73, 0x6F, 0x72, 0x20, 0x75, 0x6E, 0x75, 0x73, 0x61, 0x62, 0x6C, 0x65, 0x00, 0x00, 0x00, 0x00, 0x52, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x20, 0x69, 0x6E, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x42, 0x72, 0x65, 0x61, 0x6B, 0x70, 0x6F, 0x69, 0x6E, 0x74, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x20, 0x63, 0x61, 0x6C, 0x6C, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x42, 0x75, 0x73, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x6F, 0x6E, 0x20, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x42, 0x75, 0x73, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x6F, 0x6E, 0x20, 0x69, 0x6E, 0x73, 0x74, 0x2E, 0x00, 0x00, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x6F, 0x6E, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x00, 0x00, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x6F, 0x6E, 0x20, 0x6C, 0x6F, 0x61, 0x64, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x42, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x6E, 0x20, 0x73, 0x74, 0x6F, 0x72, 0x65, 0x00, 0x00, 0x54, 0x4C, 0x42, 0x20, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x6F, 0x6E, 0x20, 0x6C, 0x6F, 0x61, 0x64, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x42, 0x20, 0x6D, 0x6F, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x49, 0x6E, 0x74, 0x65, 0x72, 0x72, 0x75, 0x70, 0x74, 0x00, 0x00, 0x00, 0x49, 0x6E, 0x65, 0x78, 0x61, 0x63, 0x74, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x55, 0x6E, 0x64, 0x65, 0x72, 0x66, 0x6C, 0x6F, 0x77, 0x00, 0x00, 0x00, 0x4F, 0x76, 0x65, 0x72, 0x66, 0x6C, 0x6F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x44, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E, 0x20, 0x62, 0x79, 0x20, 0x7A, 0x65, 0x72, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x49, 0x6E, 0x76, 0x61, 0x6C, 0x69, 0x64, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x55, 0x6E, 0x69, 0x6D, 0x70, 0x6C, 0x65, 0x6D, 0x65, 0x6E, 0x74, 0x65, 0x64, 0x20, 0x6F, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00
+
+.section .text
+
 glabel render_curtains
 /* 6E80 8002BA80 3C01800A */  lui       $at, %hi(gCurtainScaleGoal)
 /* 6E84 8002BA84 C420BA94 */  lwc1      $f0, %lo(gCurtainScaleGoal)($at)
diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s b/ver/us/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s
index 31c4c89e12..ae811e9038 100644
--- a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s
+++ b/ver/us/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098034
+.ascii "F%02d:%+.3e\0"
+
+glabel D_80098040
+.ascii "F%02d:---------\0"
+
+.section .text
+
 glabel crash_print_fpr
 /* 76B8 8002C2B8 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 76BC 8002C2BC AFBF0018 */  sw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s b/ver/us/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s
index dc2045b0c6..37dcd3a9e5 100644
--- a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s
+++ b/ver/us/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s
@@ -1,6 +1,49 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098064
+.ascii "THREAD:%d  (%s)\0"
+
+glabel D_80098074
+.ascii "PC:%08XH   SR:%08XH   VA:%08XH\0\0"
+
+glabel D_80098094
+.ascii "AT:%08XH   V0:%08XH   V1:%08XH\0\0"
+
+glabel D_800980B4
+.ascii "A0:%08XH   A1:%08XH   A2:%08XH\0\0"
+
+glabel D_800980D4
+.ascii "A3:%08XH   T0:%08XH   T1:%08XH\0\0"
+
+glabel D_800980F4
+.ascii "T2:%08XH   T3:%08XH   T4:%08XH\0\0"
+
+glabel D_80098114
+.ascii "T5:%08XH   T6:%08XH   T7:%08XH\0\0"
+
+glabel D_80098134
+.ascii "S0:%08XH   S1:%08XH   S2:%08XH\0\0"
+
+glabel D_80098154
+.ascii "S3:%08XH   S4:%08XH   S5:%08XH\0\0"
+
+glabel D_80098174
+.ascii "S6:%08XH   S7:%08XH   T8:%08XH\0\0"
+
+glabel D_80098194
+.ascii "T9:%08XH   GP:%08XH   SP:%08XH\0\0"
+
+glabel D_800981B4
+.ascii "S8:%08XH   RA:%08XH\0"
+
+glabel D_800981C8
+.word 0x4D4D3A25, 0x30385848, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+
+.section .text
+
 glabel crash_show_handler
 /* 77B0 8002C3B0 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 77B4 8002C3B4 AFB1001C */  sw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C324.s b/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C324.s
index be4507d08c..af395e80e0 100644
--- a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C324.s
+++ b/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C324.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098050
+.ascii "FPCSR:%08XH\0"
+
+glabel D_8009805C
+.word 0x28257329, 0x00000000
+
+.section .text
+
 glabel func_8002C324
 /* 7724 8002C324 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* 7728 8002C328 AFB10014 */  sw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/code_8800/get_screen_coords.s b/ver/us/asm/nonmatchings/code_8800/get_screen_coords.s
index 70055d9210..dabeae8f21 100644
--- a/ver/us/asm/nonmatchings/code_8800/get_screen_coords.s
+++ b/ver/us/asm/nonmatchings/code_8800/get_screen_coords.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098200
+.double 0.01
+
+glabel D_80098208
+.double -0.01
+
+.section .text
+
 glabel get_screen_coords
 /* 9938 8002E538 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 993C 8002E53C AFB20040 */  sw        $s2, 0x40($sp)
diff --git a/ver/us/asm/nonmatchings/code_8800/update_cameras.s b/ver/us/asm/nonmatchings/code_8800/update_cameras.s
index fe36559e34..fde26272ac 100644
--- a/ver/us/asm/nonmatchings/code_8800/update_cameras.s
+++ b/ver/us/asm/nonmatchings/code_8800/update_cameras.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800981E0
+.word L8002D4A8_88A8, L8002D4B8_88B8, L8002D4C8_88C8, L8002D498_8898, L8002D4D8_88D8, L8002D4E8_88E8, L8002D4F8_88F8, 0
+
+.section .text
+
 glabel update_cameras
 /* 8800 8002D400 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 8804 8002D404 F7B60068 */  sdc1      $f22, 0x68($sp)
diff --git a/ver/us/asm/nonmatchings/code_B0E0/do_camera_type_3.s b/ver/us/asm/nonmatchings/code_B0E0/do_camera_type_3.s
index cfa0cbc05c..24f680a53d 100644
--- a/ver/us/asm/nonmatchings/code_B0E0/do_camera_type_3.s
+++ b/ver/us/asm/nonmatchings/code_B0E0/do_camera_type_3.s
@@ -1,6 +1,28 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098250
+.double 1.01
+
+glabel D_80098258
+.double 0.3
+
+glabel D_80098260
+.double 0.2
+
+glabel D_80098268
+.double 3.141592
+
+glabel D_80098270
+.double 0.5001
+
+glabel D_80098278
+.double 0.01
+
+.section .text
+
 glabel do_camera_type_3
 /* C894 80031494 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* C898 80031498 AFB10044 */  sw        $s1, 0x44($sp)
diff --git a/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s b/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s
index 2777133826..d4e1ea6b67 100644
--- a/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s
+++ b/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098210
+.word L800305B0_B9B0, L80030768_BB68, L80030868_BC68, L80030874_BC74, L80030880_BC80, L80030868_BC68, L80030644_BA44, 0
+
+glabel jtbl_80098230
+.word L800308D0_BCD0, L80030BFC_BFFC, L80030E54_C254, L80031210_C610, L80031220_C620, L8003106C_C46C, L800309CC_BDCC, 0
+
+.section .text
+
 glabel update_camera_from_zone
 /* B8FC 800304FC 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* B900 80030500 AFB20030 */  sw        $s2, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s b/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s
index c5c6d3af47..5510541739 100644
--- a/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s
+++ b/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s
@@ -197,8 +197,8 @@ glabel func_802B6000_E2A340
 .L802B62E4:
 /* E2A624 802B62E4 0C038039 */  jal       disable_player_shadow
 /* E2A628 802B62E8 00000000 */   nop
-/* E2A62C 802B62EC 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* E2A630 802B62F0 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
+/* E2A62C 802B62EC 3C048011 */  lui       $a0, %hi(wPartnerNpc)
+/* E2A630 802B62F0 8C84C930 */  lw        $a0, %lo(wPartnerNpc)($a0)
 /* E2A634 802B62F4 0C00EAFF */  jal       disable_npc_shadow
 /* E2A638 802B62F8 00000000 */   nop
 /* E2A63C 802B62FC 24020032 */  addiu     $v0, $zero, 0x32
diff --git a/ver/us/asm/nonmatchings/code_d610_len_1330/func_80032970.s b/ver/us/asm/nonmatchings/code_d610_len_1330/func_80032970.s
index 799f786a1e..fe415c8305 100644
--- a/ver/us/asm/nonmatchings/code_d610_len_1330/func_80032970.s
+++ b/ver/us/asm/nonmatchings/code_d610_len_1330/func_80032970.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098280
+.double 0.1
+
+glabel D_80098288
+.double -0.1
+
+.section .text
+
 glabel func_80032970
 /* DD70 80032970 44853000 */  mtc1      $a1, $f6
 /* DD74 80032974 94820000 */  lhu       $v0, ($a0)
@@ -30,8 +40,8 @@ glabel func_80032970
 /* DDCC 800329CC 00431024 */  and       $v0, $v0, $v1
 /* DDD0 800329D0 10400007 */  beqz      $v0, .L800329F0
 /* DDD4 800329D4 00000000 */   nop
-/* DDD8 800329D8 3C028011 */  lui       $v0, %hi(D_8010EBB4)
-/* DDDC 800329DC 8442EBB4 */  lh        $v0, %lo(D_8010EBB4)($v0)
+/* DDD8 800329D8 3C028011 */  lui       $v0, %hi(D_8010EBB0+0x4)
+/* DDDC 800329DC 8442EBB4 */  lh        $v0, %lo(D_8010EBB0+0x4)($v0)
 /* DDE0 800329E0 44824000 */  mtc1      $v0, $f8
 /* DDE4 800329E4 00000000 */  nop
 /* DDE8 800329E8 0800CA7E */  j         .L800329F8
diff --git a/ver/us/asm/nonmatchings/code_f270_len_1190/func_800343A4.s b/ver/us/asm/nonmatchings/code_f270_len_1190/func_800343A4.s
index c0d899e3ae..1741d2e562 100644
--- a/ver/us/asm/nonmatchings/code_f270_len_1190/func_800343A4.s
+++ b/ver/us/asm/nonmatchings/code_f270_len_1190/func_800343A4.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_800982C0
+.word L800344A8_F8A8, L800344A8_F8A8, L800344A8_F8A8, L80034628_FA28, L80034628_FA28, L80034628_FA28, L800347A8_FBA8, L800347A8_FBA8, L800347A8_FBA8, L800347A8_FBA8
+
+.section .text
+
 glabel func_800343A4
 /* F7A4 800343A4 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* F7A8 800343A8 3C05E200 */  lui       $a1, 0xe200
diff --git a/ver/us/asm/nonmatchings/code_f270_len_1190/step_logos.s b/ver/us/asm/nonmatchings/code_f270_len_1190/step_logos.s
index 45eca67265..f70656078d 100644
--- a/ver/us/asm/nonmatchings/code_f270_len_1190/step_logos.s
+++ b/ver/us/asm/nonmatchings/code_f270_len_1190/step_logos.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80098290
+.word L800341F8_F5F8, L8003411C_F51C, L80034150_F550, L80034170_F570, L800341A8_F5A8, L800341D8_F5D8, L800341F8_F5F8, L80034230_F630, L80034278_F678, L800342D4_F6D4, L800342FC_F6FC, L8003432C_F72C
+
+.section .text
+
 glabel step_logos
 /* F4A4 800340A4 3C038007 */  lui       $v1, %hi(gGameStatusPtr)
 /* F4A8 800340A8 8C63419C */  lw        $v1, %lo(gGameStatusPtr)($v1)
diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/set_anim_timescale.s b/ver/us/asm/nonmatchings/code_fee30_len_2d60/set_anim_timescale.s
deleted file mode 100644
index 4bb719d666..0000000000
--- a/ver/us/asm/nonmatchings/code_fee30_len_2d60/set_anim_timescale.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel set_anim_timescale
-/* 10097C 802DD88C 460C6300 */  add.s     $f12, $f12, $f12
-/* 100980 802DD890 3C01802E */  lui       $at, %hi(D_802DF4C0)
-/* 100984 802DD894 03E00008 */  jr        $ra
-/* 100988 802DD898 E42CF4C0 */   swc1     $f12, %lo(D_802DF4C0)($at)
diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s b/ver/us/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s
deleted file mode 100644
index 5f12f20218..0000000000
--- a/ver/us/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s
+++ /dev/null
@@ -1,125 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel spr_transform_point
-/* FFDF0 802DCD00 27BDFF20 */  addiu     $sp, $sp, -0xe0
-/* FFDF4 802DCD04 F7B800C8 */  sdc1      $f24, 0xc8($sp)
-/* FFDF8 802DCD08 4487C000 */  mtc1      $a3, $f24
-/* FFDFC 802DCD0C F7BA00D0 */  sdc1      $f26, 0xd0($sp)
-/* FFE00 802DCD10 C7BA00F0 */  lwc1      $f26, 0xf0($sp)
-/* FFE04 802DCD14 F7BC00D8 */  sdc1      $f28, 0xd8($sp)
-/* FFE08 802DCD18 C7BC00F4 */  lwc1      $f28, 0xf4($sp)
-/* FFE0C 802DCD1C AFB300A4 */  sw        $s3, 0xa4($sp)
-/* FFE10 802DCD20 8FB300F8 */  lw        $s3, 0xf8($sp)
-/* FFE14 802DCD24 AFB400A8 */  sw        $s4, 0xa8($sp)
-/* FFE18 802DCD28 8FB400FC */  lw        $s4, 0xfc($sp)
-/* FFE1C 802DCD2C AFB500AC */  sw        $s5, 0xac($sp)
-/* FFE20 802DCD30 8FB50100 */  lw        $s5, 0x100($sp)
-/* FFE24 802DCD34 AFB200A0 */  sw        $s2, 0xa0($sp)
-/* FFE28 802DCD38 0080902D */  daddu     $s2, $a0, $zero
-/* FFE2C 802DCD3C AFB1009C */  sw        $s1, 0x9c($sp)
-/* FFE30 802DCD40 AFBF00B0 */  sw        $ra, 0xb0($sp)
-/* FFE34 802DCD44 AFB00098 */  sw        $s0, 0x98($sp)
-/* FFE38 802DCD48 F7B600C0 */  sdc1      $f22, 0xc0($sp)
-/* FFE3C 802DCD4C F7B400B8 */  sdc1      $f20, 0xb8($sp)
-/* FFE40 802DCD50 16400009 */  bnez      $s2, .L802DCD78
-/* FFE44 802DCD54 00C0882D */   daddu    $s1, $a2, $zero
-/* FFE48 802DCD58 14A00007 */  bnez      $a1, .L802DCD78
-/* FFE4C 802DCD5C 00000000 */   nop
-/* FFE50 802DCD60 16200005 */  bnez      $s1, .L802DCD78
-/* FFE54 802DCD64 00000000 */   nop
-/* FFE58 802DCD68 E6780000 */  swc1      $f24, ($s3)
-/* FFE5C 802DCD6C E69A0000 */  swc1      $f26, ($s4)
-/* FFE60 802DCD70 080B73A9 */  j         .L802DCEA4
-/* FFE64 802DCD74 E6BC0000 */   swc1     $f28, ($s5)
-.L802DCD78:
-/* FFE68 802DCD78 44859000 */  mtc1      $a1, $f18
-/* FFE6C 802DCD7C 00000000 */  nop
-/* FFE70 802DCD80 468094A0 */  cvt.s.w   $f18, $f18
-/* FFE74 802DCD84 4480A000 */  mtc1      $zero, $f20
-/* FFE78 802DCD88 3C013F80 */  lui       $at, 0x3f80
-/* FFE7C 802DCD8C 4481B000 */  mtc1      $at, $f22
-/* FFE80 802DCD90 44059000 */  mfc1      $a1, $f18
-/* FFE84 802DCD94 4406A000 */  mfc1      $a2, $f20
-/* FFE88 802DCD98 4407B000 */  mfc1      $a3, $f22
-/* FFE8C 802DCD9C 27A40018 */  addiu     $a0, $sp, 0x18
-/* FFE90 802DCDA0 0C019EC8 */  jal       guRotateF
-/* FFE94 802DCDA4 E7B40010 */   swc1     $f20, 0x10($sp)
-/* FFE98 802DCDA8 27B00058 */  addiu     $s0, $sp, 0x58
-/* FFE9C 802DCDAC 44919000 */  mtc1      $s1, $f18
-/* FFEA0 802DCDB0 00000000 */  nop
-/* FFEA4 802DCDB4 468094A0 */  cvt.s.w   $f18, $f18
-/* FFEA8 802DCDB8 4406A000 */  mfc1      $a2, $f20
-/* FFEAC 802DCDBC 4407A000 */  mfc1      $a3, $f20
-/* FFEB0 802DCDC0 44059000 */  mfc1      $a1, $f18
-/* FFEB4 802DCDC4 0200202D */  daddu     $a0, $s0, $zero
-/* FFEB8 802DCDC8 0C019EC8 */  jal       guRotateF
-/* FFEBC 802DCDCC E7B60010 */   swc1     $f22, 0x10($sp)
-/* FFEC0 802DCDD0 0200202D */  daddu     $a0, $s0, $zero
-/* FFEC4 802DCDD4 27A50018 */  addiu     $a1, $sp, 0x18
-/* FFEC8 802DCDD8 0C019D80 */  jal       guMtxCatF
-/* FFECC 802DCDDC 00A0302D */   daddu    $a2, $a1, $zero
-/* FFED0 802DCDE0 44929000 */  mtc1      $s2, $f18
-/* FFED4 802DCDE4 00000000 */  nop
-/* FFED8 802DCDE8 468094A0 */  cvt.s.w   $f18, $f18
-/* FFEDC 802DCDEC 4406B000 */  mfc1      $a2, $f22
-/* FFEE0 802DCDF0 4407A000 */  mfc1      $a3, $f20
-/* FFEE4 802DCDF4 44059000 */  mfc1      $a1, $f18
-/* FFEE8 802DCDF8 0200202D */  daddu     $a0, $s0, $zero
-/* FFEEC 802DCDFC 0C019EC8 */  jal       guRotateF
-/* FFEF0 802DCE00 AFA70010 */   sw       $a3, 0x10($sp)
-/* FFEF4 802DCE04 0200202D */  daddu     $a0, $s0, $zero
-/* FFEF8 802DCE08 27A50018 */  addiu     $a1, $sp, 0x18
-/* FFEFC 802DCE0C 0C019D80 */  jal       guMtxCatF
-/* FFF00 802DCE10 00A0302D */   daddu    $a2, $a1, $zero
-/* FFF04 802DCE14 C7A80018 */  lwc1      $f8, 0x18($sp)
-/* FFF08 802DCE18 46184202 */  mul.s     $f8, $f8, $f24
-/* FFF0C 802DCE1C 00000000 */  nop
-/* FFF10 802DCE20 C7B00028 */  lwc1      $f16, 0x28($sp)
-/* FFF14 802DCE24 461A8402 */  mul.s     $f16, $f16, $f26
-/* FFF18 802DCE28 00000000 */  nop
-/* FFF1C 802DCE2C C7AE0038 */  lwc1      $f14, 0x38($sp)
-/* FFF20 802DCE30 461C7382 */  mul.s     $f14, $f14, $f28
-/* FFF24 802DCE34 00000000 */  nop
-/* FFF28 802DCE38 C7A2001C */  lwc1      $f2, 0x1c($sp)
-/* FFF2C 802DCE3C 46181082 */  mul.s     $f2, $f2, $f24
-/* FFF30 802DCE40 00000000 */  nop
-/* FFF34 802DCE44 C7AA002C */  lwc1      $f10, 0x2c($sp)
-/* FFF38 802DCE48 461A5282 */  mul.s     $f10, $f10, $f26
-/* FFF3C 802DCE4C 00000000 */  nop
-/* FFF40 802DCE50 C7AC003C */  lwc1      $f12, 0x3c($sp)
-/* FFF44 802DCE54 461C6302 */  mul.s     $f12, $f12, $f28
-/* FFF48 802DCE58 00000000 */  nop
-/* FFF4C 802DCE5C C7A00020 */  lwc1      $f0, 0x20($sp)
-/* FFF50 802DCE60 46180002 */  mul.s     $f0, $f0, $f24
-/* FFF54 802DCE64 00000000 */  nop
-/* FFF58 802DCE68 C7A40030 */  lwc1      $f4, 0x30($sp)
-/* FFF5C 802DCE6C 461A2102 */  mul.s     $f4, $f4, $f26
-/* FFF60 802DCE70 00000000 */  nop
-/* FFF64 802DCE74 C7A60040 */  lwc1      $f6, 0x40($sp)
-/* FFF68 802DCE78 461C3182 */  mul.s     $f6, $f6, $f28
-/* FFF6C 802DCE7C 00000000 */  nop
-/* FFF70 802DCE80 46104200 */  add.s     $f8, $f8, $f16
-/* FFF74 802DCE84 460A1080 */  add.s     $f2, $f2, $f10
-/* FFF78 802DCE88 46040000 */  add.s     $f0, $f0, $f4
-/* FFF7C 802DCE8C 460E4200 */  add.s     $f8, $f8, $f14
-/* FFF80 802DCE90 460C1080 */  add.s     $f2, $f2, $f12
-/* FFF84 802DCE94 46060000 */  add.s     $f0, $f0, $f6
-/* FFF88 802DCE98 E6680000 */  swc1      $f8, ($s3)
-/* FFF8C 802DCE9C E6820000 */  swc1      $f2, ($s4)
-/* FFF90 802DCEA0 E6A00000 */  swc1      $f0, ($s5)
-.L802DCEA4:
-/* FFF94 802DCEA4 8FBF00B0 */  lw        $ra, 0xb0($sp)
-/* FFF98 802DCEA8 8FB500AC */  lw        $s5, 0xac($sp)
-/* FFF9C 802DCEAC 8FB400A8 */  lw        $s4, 0xa8($sp)
-/* FFFA0 802DCEB0 8FB300A4 */  lw        $s3, 0xa4($sp)
-/* FFFA4 802DCEB4 8FB200A0 */  lw        $s2, 0xa0($sp)
-/* FFFA8 802DCEB8 8FB1009C */  lw        $s1, 0x9c($sp)
-/* FFFAC 802DCEBC 8FB00098 */  lw        $s0, 0x98($sp)
-/* FFFB0 802DCEC0 D7BC00D8 */  ldc1      $f28, 0xd8($sp)
-/* FFFB4 802DCEC4 D7BA00D0 */  ldc1      $f26, 0xd0($sp)
-/* FFFB8 802DCEC8 D7B800C8 */  ldc1      $f24, 0xc8($sp)
-/* FFFBC 802DCECC D7B600C0 */  ldc1      $f22, 0xc0($sp)
-/* FFFC0 802DCED0 D7B400B8 */  ldc1      $f20, 0xb8($sp)
-/* FFFC4 802DCED4 03E00008 */  jr        $ra
-/* FFFC8 802DCED8 27BD00E0 */   addiu    $sp, $sp, 0xe0
diff --git a/ver/us/asm/nonmatchings/os/code_3FEA0/_Printf.s b/ver/us/asm/nonmatchings/os/code_3FEA0/_Printf.s
index f9f21325b4..571e4ed85a 100644
--- a/ver/us/asm/nonmatchings/os/code_3FEA0/_Printf.s
+++ b/ver/us/asm/nonmatchings/os/code_3FEA0/_Printf.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099BF0
+.word 0x202B2D23, 0x30000000
+
+glabel D_80099BF8
+.word 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 0x00000000
+
+glabel D_80099C10
+.word 0x686C4C00, 0x00000000
+
+.section .text
+
 glabel _Printf
 /* 3FEA0 80064AA0 27BDFF50 */  addiu     $sp, $sp, -0xb0
 /* 3FEA4 80064AA4 AFB400A0 */  sw        $s4, 0xa0($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s b/ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s
index e9f088e9e9..57a96087c7 100644
--- a/ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s
+++ b/ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80099C18
+.word L800654B0_408B0, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800652CC_406CC, L800654CC_408CC, L800652CC_406CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800651B4_405B4, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L80065080_40480, L800650B4_404B4, L800652CC_406CC, L800652CC_406CC, L800652CC_406CC, L800654CC_408CC, L800650B4_404B4, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L800654CC_408CC, L80065380_40780, L800651B4_405B4, L80065420_40820, L800654CC_408CC, L800654CC_408CC, L8006546C_4086C, L800654CC_408CC, L800651B4_405B4, L800654CC_408CC, L800654CC_408CC, L800651B4_405B4, 0, 0
+
+.section .text
+
 glabel _Putfld
 /* 40420 80065020 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 40424 80065024 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s b/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s
index a34cda906d..84539a28a2 100644
--- a/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s
+++ b/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel jtbl_80099B20
+.word L800613D4_3C7D4, L800612F4_3C6F4, L80061328_3C728, L800613E4_3C7E4, L800613E4_3C7E4, L8006135C_3C75C, L80061398_3C798, 0
+
+.section .text
+
 glabel osDevMgrMain
 /* 3C490 80061090 27BDFFB8 */  addiu     $sp, $sp, -0x48
 /* 3C494 80061094 AFB20030 */  sw        $s2, 0x30($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s b/ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s
index 9bcfdfefc8..5603a931a8 100644
--- a/ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s
+++ b/ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099B40
+.double 4294967296.0, 0.0
+
+.section .text
+
 glabel osAiSetFrequency
 /* 3C960 80061560 44841000 */  mtc1      $a0, $f2
 /* 3C964 80061564 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s b/ver/us/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s
index ea206e3083..1b21b2d7e5 100644
--- a/ver/us/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s
+++ b/ver/us/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099B70
+.double -1.0
+
+glabel D_80099B78
+.double 1.0
+
+glabel D_80099B80
+.double 0.1
+
+glabel D_80099B88
+.double 1.0
+
+glabel D_80099B90
+.double 0.1, 0.0
+
+.section .text
+
 glabel guLookAtHiliteF
 /* 3DCC0 800628C0 27BDFF88 */  addiu     $sp, $sp, -0x78
 /* 3DCC4 800628C4 F7BE0070 */  sdc1      $f30, 0x70($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s b/ver/us/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s
index ba6a4bc5e5..828845b95e 100644
--- a/ver/us/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s
+++ b/ver/us/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099BA0
+.double -1.0
+
+glabel D_80099BA8
+.word 0x3FF00000, 0x00000000
+
+.section .text
+
 glabel guLookAtReflectF
 /* 3E720 80063320 27BDFF98 */  addiu     $sp, $sp, -0x68
 /* 3E724 80063324 F7BC0058 */  sdc1      $f28, 0x58($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s b/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s
index c4802ee95f..a8661fe982 100644
--- a/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s
+++ b/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099BD0
+.double 0.017453292222222222
+
+glabel D_80099BD8
+.double 2.0
+
+glabel D_80099BE0
+.double 131072.0
+
+glabel D_80099BE8
+.double 2147483648.0
+
+.section .text
+
 glabel guPerspective
 /* 3F140 80063D40 27BDFF78 */  addiu     $sp, $sp, -0x88
 /* 3F144 80063D44 F7B80070 */  sdc1      $f24, 0x70($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s b/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s
index 471d0f75bc..f4c8c39fa7 100644
--- a/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s
+++ b/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s
@@ -1,6 +1,22 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099BB0
+.double 0.017453292222222222
+
+glabel D_80099BB8
+.double 2.0
+
+glabel D_80099BC0
+.double 131072.0
+
+glabel D_80099BC8
+.double 2147483648.0
+
+.section .text
+
 glabel guPerspectiveF
 /* 3EF90 80063B90 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 3EF94 80063B94 F7BA0038 */  sdc1      $f26, 0x38($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s b/ver/us/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s
index e29ef3f0d6..e5836a7b08 100644
--- a/ver/us/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s
+++ b/ver/us/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099D70
+.double 4294967296.0, 0.0
+
+.section .text
+
 glabel osViSwapContext
 /* 42470 80067070 27BDFFD8 */  addiu     $sp, $sp, -0x28
 /* 42474 80067074 AFB00010 */  sw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s b/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s
index 08495265aa..62a4a090d9 100644
--- a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s
+++ b/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s
@@ -1,6 +1,13 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099E30
+.word 0x30000000, 0x00000000, 0x00000000, 0x00000000
+
+.section .text
+
 glabel _Genld
 /* 474B4 8006C0B4 27BDFFD0 */  addiu     $sp, $sp, -0x30
 /* 474B8 8006C0B8 AFB20018 */  sw        $s2, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s b/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s
index c2c8553d0d..a48190bacd 100644
--- a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s
+++ b/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s
@@ -1,6 +1,25 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099DD0
+.word 0x40240000, 0x00000000, 0x40590000, 0x00000000, 0x40C38800, 0x00000000, 0x4197D784, 0x00000000, 0x4341C379, 0x37E08000, 0x4693B8B5, 0xB5056E17, 0x4D384F03, 0xE93FF9F5, 0x5A827748, 0xF9301D32, 0x75154FDD, 0x7F73BF3C
+
+glabel D_80099E18
+.word 0x4E614E00
+
+glabel D_80099E1C
+.word 0x496E6600
+
+glabel D_80099E20
+.double 1.0
+
+glabel D_80099E28
+.double 100000000.0
+
+.section .text
+
 glabel _Ldtob
 /* 46FD0 8006BBD0 27BDFF80 */  addiu     $sp, $sp, -0x80
 /* 46FD4 8006BBD4 AFB30054 */  sw        $s3, 0x54($sp)
diff --git a/ver/us/asm/nonmatchings/os/guLookAt/guLookAt.s b/ver/us/asm/nonmatchings/os/guLookAt/guLookAt.s
index b229dde68e..e8dd276686 100644
--- a/ver/us/asm/nonmatchings/os/guLookAt/guLookAt.s
+++ b/ver/us/asm/nonmatchings/os/guLookAt/guLookAt.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099B60
+.double -1.0
+
+glabel D_80099B68
+.word 0x3FF00000, 0x00000000
+
+.section .text
+
 glabel guLookAt
 /* 3D930 80062530 27BDFF48 */  addiu     $sp, $sp, -0xb8
 /* 3D934 80062534 AFB20068 */  sw        $s2, 0x68($sp)
diff --git a/ver/us/asm/nonmatchings/os/guLookAt/guLookAtF.s b/ver/us/asm/nonmatchings/os/guLookAt/guLookAtF.s
index 43c7426206..721949cfbd 100644
--- a/ver/us/asm/nonmatchings/os/guLookAt/guLookAtF.s
+++ b/ver/us/asm/nonmatchings/os/guLookAt/guLookAtF.s
@@ -1,6 +1,16 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80099B50
+.double -1.0
+
+glabel D_80099B58
+.word 0x3FF00000, 0x00000000
+
+.section .text
+
 glabel guLookAtF
 /* 3D5B0 800621B0 27BDFF90 */  addiu     $sp, $sp, -0x70
 /* 3D5B4 800621B4 AFB30024 */  sw        $s3, 0x24($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s b/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s
index 47b1c82c6c..1b264b4ce0 100644
--- a/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s
+++ b/ver/us/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s
@@ -80,8 +80,8 @@ glabel func_80240000_BDD1B0
 /* BDD2D4 80240124 45030001 */  bc1tl     .L8024012C
 /* BDD2D8 80240128 0000802D */   daddu    $s0, $zero, $zero
 .L8024012C:
-/* BDD2DC 8024012C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* BDD2E0 80240130 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* BDD2DC 8024012C 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* BDD2E0 80240130 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* BDD2E4 80240134 24020009 */  addiu     $v0, $zero, 9
 /* BDD2E8 80240138 50620001 */  beql      $v1, $v0, .L80240140
 /* BDD2EC 8024013C 0000802D */   daddu    $s0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s
index e299870f15..11b29cd149 100644
--- a/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s
+++ b/ver/us/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s
@@ -80,8 +80,8 @@ glabel func_80242388_BE5B38
 /* BE5C5C 802424AC 45030001 */  bc1tl     .L802424B4
 /* BE5C60 802424B0 0000802D */   daddu    $s0, $zero, $zero
 .L802424B4:
-/* BE5C64 802424B4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* BE5C68 802424B8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* BE5C64 802424B4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* BE5C68 802424B8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* BE5C6C 802424BC 24020009 */  addiu     $v0, $zero, 9
 /* BE5C70 802424C0 50620001 */  beql      $v1, $v0, .L802424C8
 /* BE5C74 802424C4 0000802D */   daddu    $s0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s b/ver/us/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s
index d168cfb69a..669bcf7b58 100644
--- a/ver/us/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s
+++ b/ver/us/asm/nonmatchings/world/area_arn/arn_08/BF4860/func_8024019C_BF493C.s
@@ -34,8 +34,8 @@ glabel func_8024019C_BF493C
 /* BF49A4 80240204 0809009C */  j         .L80240270
 /* BF49A8 80240208 AC820000 */   sw       $v0, ($a0)
 .L8024020C:
-/* BF49AC 8024020C 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* BF49B0 80240210 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* BF49AC 8024020C 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* BF49B0 80240210 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* BF49B4 80240214 0C03BD17 */  jal       clear_partner_move_history
 /* BF49B8 80240218 8E040000 */   lw       $a0, ($s0)
 /* BF49BC 8024021C C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
index 85b2a5f717..bef7592cce 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241954_BFF1D4.s
@@ -150,8 +150,8 @@ glabel func_80241954_BFF1D4
 /* BFF40C 80241B8C AE400048 */  sw        $zero, 0x48($s2)
 /* BFF410 80241B90 00431024 */  and       $v0, $v0, $v1
 /* BFF414 80241B94 AE420000 */  sw        $v0, ($s2)
-/* BFF418 80241B98 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* BFF41C 80241B9C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* BFF418 80241B98 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* BFF41C 80241B9C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* BFF420 80241BA0 24020009 */  addiu     $v0, $zero, 9
 /* BFF424 80241BA4 10620009 */  beq       $v1, $v0, .L80241BCC
 /* BFF428 80241BA8 24020010 */   addiu    $v0, $zero, 0x10
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s
index 52ed86f384..89fb449f3f 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s
@@ -18,8 +18,8 @@ glabel func_80241E70_BFF6F0
 /* BFF724 80241EA4 28420003 */  slti      $v0, $v0, 3
 /* BFF728 80241EA8 1440000D */  bnez      $v0, .L80241EE0
 /* BFF72C 80241EAC 24020009 */   addiu    $v0, $zero, 9
-/* BFF730 80241EB0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* BFF734 80241EB4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* BFF730 80241EB0 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* BFF734 80241EB4 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* BFF738 80241EB8 10620003 */  beq       $v1, $v0, .L80241EC8
 /* BFF73C 80241EBC 24020064 */   addiu    $v0, $zero, 0x64
 /* BFF740 80241EC0 080907B7 */  j         .L80241EDC
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s
index a5a6ffb249..88b0c792fc 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240208_C2EDA8.s
@@ -97,8 +97,8 @@ glabel func_80240208_C2EDA8
 /* C2EF0C 8024036C 45030001 */  bc1tl     .L80240374
 /* C2EF10 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C2EF14 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C2EF18 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C2EF14 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C2EF18 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C2EF1C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C2EF20 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C2EF24 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s
index 9733287e55..12ee6920aa 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s
@@ -89,8 +89,8 @@ glabel func_80240958_C2F4F8
 /* C2F62C 80240A8C E7A00028 */  swc1      $f0, 0x28($sp)
 /* C2F630 80240A90 0C00A7E7 */  jal       add_vec2D_polar
 /* C2F634 80240A94 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C2F638 80240A98 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* C2F63C 80240A9C 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* C2F638 80240A98 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* C2F63C 80240A9C 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* C2F640 80240AA0 C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C2F644 80240AA4 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C2F648 80240AA8 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s
index c86c8f283e..97843d0470 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s
@@ -97,8 +97,8 @@ glabel func_80240458_C31938
 /* C31A9C 802405BC 45030001 */  bc1tl     .L802405C4
 /* C31AA0 802405C0 0000882D */   daddu    $s1, $zero, $zero
 .L802405C4:
-/* C31AA4 802405C4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C31AA8 802405C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C31AA4 802405C4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C31AA8 802405C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C31AAC 802405CC 24020009 */  addiu     $v0, $zero, 9
 /* C31AB0 802405D0 50620001 */  beql      $v1, $v0, .L802405D8
 /* C31AB4 802405D4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s
index cc31cceec8..7df1e9f9c1 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s
@@ -89,8 +89,8 @@ glabel func_80241D04_C331E4
 /* C33318 80241E38 E7A00028 */  swc1      $f0, 0x28($sp)
 /* C3331C 80241E3C 0C00A7E7 */  jal       add_vec2D_polar
 /* C33320 80241E40 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C33324 80241E44 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* C33328 80241E48 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* C33324 80241E44 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* C33328 80241E48 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* C3332C 80241E4C C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C33330 80241E50 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C33334 80241E54 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
index 9b8b87f4b2..b3b054b39c 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s
@@ -150,8 +150,8 @@ glabel func_802417F8_C37D28
 /* C37F60 80241A30 AE400048 */  sw        $zero, 0x48($s2)
 /* C37F64 80241A34 00431024 */  and       $v0, $v0, $v1
 /* C37F68 80241A38 AE420000 */  sw        $v0, ($s2)
-/* C37F6C 80241A3C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C37F70 80241A40 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C37F6C 80241A3C 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C37F70 80241A40 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C37F74 80241A44 24020009 */  addiu     $v0, $zero, 9
 /* C37F78 80241A48 10620009 */  beq       $v1, $v0, .L80241A70
 /* C37F7C 80241A4C 24020010 */   addiu    $v0, $zero, 0x10
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s
index 0cfe84cd7a..0f7c036268 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s
@@ -18,8 +18,8 @@ glabel func_80241D14_C38244
 /* C38278 80241D48 28420003 */  slti      $v0, $v0, 3
 /* C3827C 80241D4C 1440000D */  bnez      $v0, .L80241D84
 /* C38280 80241D50 24020009 */   addiu    $v0, $zero, 9
-/* C38284 80241D54 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C38288 80241D58 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C38284 80241D54 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C38288 80241D58 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C3828C 80241D5C 10620003 */  beq       $v1, $v0, .L80241D6C
 /* C38290 80241D60 24020064 */   addiu    $v0, $zero, 0x64
 /* C38294 80241D64 08090760 */  j         .L80241D80
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s
index 8837142021..0f2d5ed5d7 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240268_C3AC78.s
@@ -97,8 +97,8 @@ glabel func_80240268_C3AC78
 /* C3ADDC 802403CC 45030001 */  bc1tl     .L802403D4
 /* C3ADE0 802403D0 0000882D */   daddu    $s1, $zero, $zero
 .L802403D4:
-/* C3ADE4 802403D4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C3ADE8 802403D8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C3ADE4 802403D4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C3ADE8 802403D8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C3ADEC 802403DC 24020009 */  addiu     $v0, $zero, 9
 /* C3ADF0 802403E0 50620001 */  beql      $v1, $v0, .L802403E8
 /* C3ADF4 802403E4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s
index dccf459ecb..4ff2c98b89 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240704_C3B114.s
@@ -89,8 +89,8 @@ glabel func_80240704_C3B114
 /* C3B248 80240838 E7A00028 */  swc1      $f0, 0x28($sp)
 /* C3B24C 8024083C 0C00A7E7 */  jal       add_vec2D_polar
 /* C3B250 80240840 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C3B254 80240844 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* C3B258 80240848 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* C3B254 80240844 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* C3B258 80240848 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* C3B25C 8024084C C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C3B260 80240850 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C3B264 80240854 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s
index 711603c85b..b928255acd 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s
@@ -97,8 +97,8 @@ glabel func_80240208_C3DDF8
 /* C3DF5C 8024036C 45030001 */  bc1tl     .L80240374
 /* C3DF60 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C3DF64 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C3DF68 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C3DF64 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C3DF68 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C3DF6C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C3DF70 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C3DF74 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s
index dc9c8927a7..45676316e8 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_802406A4_C3E294.s
@@ -89,8 +89,8 @@ glabel func_802406A4_C3E294
 /* C3E3C8 802407D8 E7A00028 */  swc1      $f0, 0x28($sp)
 /* C3E3CC 802407DC 0C00A7E7 */  jal       add_vec2D_polar
 /* C3E3D0 802407E0 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C3E3D4 802407E4 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* C3E3D8 802407E8 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* C3E3D4 802407E4 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* C3E3D8 802407E8 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* C3E3DC 802407EC C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C3E3E0 802407F0 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C3E3E4 802407F4 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s
index ca83cf69c1..d5b60e3d2a 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241098_C40E48.s
@@ -97,8 +97,8 @@ glabel func_80241098_C40E48
 /* C40FAC 802411FC 45030001 */  bc1tl     .L80241204
 /* C40FB0 80241200 0000882D */   daddu    $s1, $zero, $zero
 .L80241204:
-/* C40FB4 80241204 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C40FB8 80241208 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C40FB4 80241204 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C40FB8 80241208 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C40FBC 8024120C 24020009 */  addiu     $v0, $zero, 9
 /* C40FC0 80241210 50620001 */  beql      $v1, $v0, .L80241218
 /* C40FC4 80241214 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
index 853330eb8c..81b2302723 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242F94_C42D44.s
@@ -150,8 +150,8 @@ glabel func_80242F94_C42D44
 /* C42F7C 802431CC AE400048 */  sw        $zero, 0x48($s2)
 /* C42F80 802431D0 00431024 */  and       $v0, $v0, $v1
 /* C42F84 802431D4 AE420000 */  sw        $v0, ($s2)
-/* C42F88 802431D8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C42F8C 802431DC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C42F88 802431D8 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C42F8C 802431DC 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C42F90 802431E0 24020009 */  addiu     $v0, $zero, 9
 /* C42F94 802431E4 10620009 */  beq       $v1, $v0, .L8024320C
 /* C42F98 802431E8 24020010 */   addiu    $v0, $zero, 0x10
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s
index a1963a290c..d102685be2 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s
@@ -18,8 +18,8 @@ glabel func_802434B0_C43260
 /* C43294 802434E4 28420003 */  slti      $v0, $v0, 3
 /* C43298 802434E8 1440000D */  bnez      $v0, .L80243520
 /* C4329C 802434EC 24020009 */   addiu    $v0, $zero, 9
-/* C432A0 802434F0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C432A4 802434F4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C432A0 802434F0 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C432A4 802434F4 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C432A8 802434F8 10620003 */  beq       $v1, $v0, .L80243508
 /* C432AC 802434FC 24020064 */   addiu    $v0, $zero, 0x64
 /* C432B0 80243500 08090D47 */  j         .L8024351C
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s
index ee7e562bf8..4ff486d5e1 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240208_C46DE8.s
@@ -97,8 +97,8 @@ glabel func_80240208_C46DE8
 /* C46F4C 8024036C 45030001 */  bc1tl     .L80240374
 /* C46F50 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C46F54 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C46F58 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C46F54 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C46F58 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C46F5C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C46F60 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C46F64 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s
index 7a29053781..2c5c657327 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80240958_C47538.s
@@ -89,8 +89,8 @@ glabel func_80240958_C47538
 /* C4766C 80240A8C E7A00028 */  swc1      $f0, 0x28($sp)
 /* C47670 80240A90 0C00A7E7 */  jal       add_vec2D_polar
 /* C47674 80240A94 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C47678 80240A98 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* C4767C 80240A9C 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* C47678 80240A98 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* C4767C 80240A9C 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* C47680 80240AA0 C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C47684 80240AA4 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C47688 80240AA8 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
index e9dda2c3f2..0446d7db51 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s
@@ -150,8 +150,8 @@ glabel func_80242C1C_C497FC
 /* C49A34 80242E54 AE400048 */  sw        $zero, 0x48($s2)
 /* C49A38 80242E58 00431024 */  and       $v0, $v0, $v1
 /* C49A3C 80242E5C AE420000 */  sw        $v0, ($s2)
-/* C49A40 80242E60 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C49A44 80242E64 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C49A40 80242E60 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C49A44 80242E64 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C49A48 80242E68 24020009 */  addiu     $v0, $zero, 9
 /* C49A4C 80242E6C 10620009 */  beq       $v1, $v0, .L80242E94
 /* C49A50 80242E70 24020010 */   addiu    $v0, $zero, 0x10
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s
index 70a8768d83..0ba7da725e 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s
@@ -18,8 +18,8 @@ glabel func_80243138_C49D18
 /* C49D4C 8024316C 28420003 */  slti      $v0, $v0, 3
 /* C49D50 80243170 1440000D */  bnez      $v0, .L802431A8
 /* C49D54 80243174 24020009 */   addiu    $v0, $zero, 9
-/* C49D58 80243178 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C49D5C 8024317C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C49D58 80243178 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C49D5C 8024317C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C49D60 80243180 10620003 */  beq       $v1, $v0, .L80243190
 /* C49D64 80243184 24020064 */   addiu    $v0, $zero, 0x64
 /* C49D68 80243188 08090C69 */  j         .L802431A4
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s
index cbdb412b0e..fc4e223939 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240208_C4F718.s
@@ -97,8 +97,8 @@ glabel func_80240208_C4F718
 /* C4F87C 8024036C 45030001 */  bc1tl     .L80240374
 /* C4F880 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C4F884 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C4F888 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C4F884 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C4F888 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C4F88C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C4F890 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C4F894 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s
index 9af2d0db3b..383e395ae8 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240208_C52748.s
@@ -97,8 +97,8 @@ glabel func_80240208_C52748
 /* C528AC 8024036C 45030001 */  bc1tl     .L80240374
 /* C528B0 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* C528B4 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C528B8 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C528B4 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C528B8 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C528BC 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* C528C0 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* C528C4 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s
index fb97844d84..ccb9e32de9 100644
--- a/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s
+++ b/ver/us/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_802406A4_C52BE4.s
@@ -89,8 +89,8 @@ glabel func_802406A4_C52BE4
 /* C52D18 802407D8 E7A00028 */  swc1      $f0, 0x28($sp)
 /* C52D1C 802407DC 0C00A7E7 */  jal       add_vec2D_polar
 /* C52D20 802407E0 E7A2002C */   swc1     $f2, 0x2c($sp)
-/* C52D24 802407E4 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* C52D28 802407E8 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* C52D24 802407E4 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* C52D28 802407E8 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* C52D2C 802407EC C7AC0028 */  lwc1      $f12, 0x28($sp)
 /* C52D30 802407F0 C7AE002C */  lwc1      $f14, 0x2c($sp)
 /* C52D34 802407F4 8C460038 */  lw        $a2, 0x38($v0)
diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s
index d766f2247d..39eee9490a 100644
--- a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s
+++ b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_8024095C_97BF8C.s
@@ -37,8 +37,8 @@ glabel func_8024095C_97BF8C
 /* 97BFFC 802409CC C6200028 */  lwc1      $f0, 0x28($s1)
 /* 97C000 802409D0 3C0141F0 */  lui       $at, 0x41f0
 /* 97C004 802409D4 44811000 */  mtc1      $at, $f2
-/* 97C008 802409D8 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* 97C00C 802409DC 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* 97C008 802409D8 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* 97C00C 802409DC 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* 97C010 802409E0 46020001 */  sub.s     $f0, $f0, $f2
 /* 97C014 802409E4 8E040000 */  lw        $a0, ($s0)
 /* 97C018 802409E8 E4800038 */  swc1      $f0, 0x38($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s
index 30a91c0a1a..dc754dd840 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s
@@ -89,8 +89,8 @@ glabel func_80240520_90FBD0
 /* 90FD1C 8024066C 00000000 */  nop
 /* 90FD20 80240670 4501001F */  bc1t      .L802406F0
 /* 90FD24 80240674 2402FFFF */   addiu    $v0, $zero, -1
-/* 90FD28 80240678 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* 90FD2C 8024067C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* 90FD28 80240678 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* 90FD2C 8024067C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* 90FD30 80240680 24020009 */  addiu     $v0, $zero, 9
 /* 90FD34 80240684 10620019 */  beq       $v1, $v0, .L802406EC
 /* 90FD38 80240688 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s
index ddd0aca58a..51e10b5c9e 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241414_910AC4.s
@@ -106,8 +106,8 @@ glabel func_80241414_910AC4
 /* 910C4C 8024159C 45030001 */  bc1tl     .L802415A4
 /* 910C50 802415A0 0000802D */   daddu    $s0, $zero, $zero
 .L802415A4:
-/* 910C54 802415A4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* 910C58 802415A8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* 910C54 802415A4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* 910C58 802415A8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* 910C5C 802415AC 24020009 */  addiu     $v0, $zero, 9
 /* 910C60 802415B0 50620001 */  beql      $v1, $v0, .L802415B8
 /* 910C64 802415B4 0000802D */   daddu    $s0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s
index 8d9fdc1708..f303164472 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s
@@ -80,8 +80,8 @@ glabel func_802422C4_911974
 /* 911A98 802423E8 45030001 */  bc1tl     .L802423F0
 /* 911A9C 802423EC 0000802D */   daddu    $s0, $zero, $zero
 .L802423F0:
-/* 911AA0 802423F0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* 911AA4 802423F4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* 911AA0 802423F0 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* 911AA4 802423F4 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* 911AA8 802423F8 24020009 */  addiu     $v0, $zero, 9
 /* 911AAC 802423FC 50620001 */  beql      $v1, $v0, .L80242404
 /* 911AB0 80242400 0000802D */   daddu    $s0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s
index 027a0800ac..e493c813c9 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240000_915D70.s
@@ -80,8 +80,8 @@ glabel func_80240000_915D70
 /* 915E94 80240124 45030001 */  bc1tl     .L8024012C
 /* 915E98 80240128 0000802D */   daddu    $s0, $zero, $zero
 .L8024012C:
-/* 915E9C 8024012C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* 915EA0 80240130 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* 915E9C 8024012C 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* 915EA0 80240130 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* 915EA4 80240134 24020009 */  addiu     $v0, $zero, 9
 /* 915EA8 80240138 50620001 */  beql      $v1, $v0, .L80240140
 /* 915EAC 8024013C 0000802D */   daddu    $s0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s
index aa8a1102e1..acb1f4c36c 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240340_918EF0.s
@@ -80,8 +80,8 @@ glabel func_80240340_918EF0
 /* 919014 80240464 45030001 */  bc1tl     .L8024046C
 /* 919018 80240468 0000802D */   daddu    $s0, $zero, $zero
 .L8024046C:
-/* 91901C 8024046C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* 919020 80240470 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* 91901C 8024046C 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* 919020 80240470 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* 919024 80240474 24020009 */  addiu     $v0, $zero, 9
 /* 919028 80240478 50620001 */  beql      $v1, $v0, .L80240480
 /* 91902C 8024047C 0000802D */   daddu    $s0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s
index 1e49ecfe41..a5f0fe2e42 100644
--- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s
+++ b/ver/us/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s
@@ -80,8 +80,8 @@ glabel func_80240080_91B960
 /* 91BA84 802401A4 45030001 */  bc1tl     .L802401AC
 /* 91BA88 802401A8 0000802D */   daddu    $s0, $zero, $zero
 .L802401AC:
-/* 91BA8C 802401AC 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* 91BA90 802401B0 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* 91BA8C 802401AC 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* 91BA90 802401B0 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* 91BA94 802401B4 24020009 */  addiu     $v0, $zero, 9
 /* 91BA98 802401B8 50620001 */  beql      $v1, $v0, .L802401C0
 /* 91BA9C 802401BC 0000802D */   daddu    $s0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s b/ver/us/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s
index a51175eae8..9353130c55 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s
@@ -60,8 +60,8 @@ glabel func_80240FC0_B45730
 /* B45800 80241090 08090436 */  j         .L802410D8
 /* B45804 80241094 AE020000 */   sw       $v0, ($s0)
 .L80241098:
-/* B45808 80241098 3C038011 */  lui       $v1, %hi(D_8010C930)
-/* B4580C 8024109C 8C63C930 */  lw        $v1, %lo(D_8010C930)($v1)
+/* B45808 80241098 3C038011 */  lui       $v1, %hi(wPartnerNpc)
+/* B4580C 8024109C 8C63C930 */  lw        $v1, %lo(wPartnerNpc)($v1)
 /* B45810 802410A0 3C014387 */  lui       $at, 0x4387
 /* B45814 802410A4 44810000 */  mtc1      $at, $f0
 /* B45818 802410A8 3C014334 */  lui       $at, 0x4334
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s
index 97a4917da9..4f7162e4b0 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s
@@ -97,8 +97,8 @@ glabel func_80241AD4_B4C544
 /* B4C6A8 80241C38 45030001 */  bc1tl     .L80241C40
 /* B4C6AC 80241C3C 0000882D */   daddu    $s1, $zero, $zero
 .L80241C40:
-/* B4C6B0 80241C40 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* B4C6B4 80241C44 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* B4C6B0 80241C40 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* B4C6B4 80241C44 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* B4C6B8 80241C48 24020009 */  addiu     $v0, $zero, 9
 /* B4C6BC 80241C4C 50620001 */  beql      $v1, $v0, .L80241C54
 /* B4C6C0 80241C50 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s
index 5ddd4fe1dc..be48694657 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s
@@ -97,8 +97,8 @@ glabel func_80241A24_B54254
 /* B543B8 80241B88 45030001 */  bc1tl     .L80241B90
 /* B543BC 80241B8C 0000882D */   daddu    $s1, $zero, $zero
 .L80241B90:
-/* B543C0 80241B90 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* B543C4 80241B94 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* B543C0 80241B90 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* B543C4 80241B94 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* B543C8 80241B98 24020009 */  addiu     $v0, $zero, 9
 /* B543CC 80241B9C 50620001 */  beql      $v1, $v0, .L80241BA4
 /* B543D0 80241BA0 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s
index f770687646..b8302a8e4c 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_07/B59870/func_8024041C_B59C8C.s
@@ -97,8 +97,8 @@ glabel func_8024041C_B59C8C
 /* B59DF0 80240580 45030001 */  bc1tl     .L80240588
 /* B59DF4 80240584 0000882D */   daddu    $s1, $zero, $zero
 .L80240588:
-/* B59DF8 80240588 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* B59DFC 8024058C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* B59DF8 80240588 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* B59DFC 8024058C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* B59E00 80240590 24020009 */  addiu     $v0, $zero, 9
 /* B59E04 80240594 50620001 */  beql      $v1, $v0, .L8024059C
 /* B59E08 80240598 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s
index 9054a97dc9..544f5e26e5 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241870_B5FB20.s
@@ -97,8 +97,8 @@ glabel func_80241870_B5FB20
 /* B5FC84 802419D4 45030001 */  bc1tl     .L802419DC
 /* B5FC88 802419D8 0000882D */   daddu    $s1, $zero, $zero
 .L802419DC:
-/* B5FC8C 802419DC 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* B5FC90 802419E0 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* B5FC8C 802419DC 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* B5FC90 802419E0 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* B5FC94 802419E4 24020009 */  addiu     $v0, $zero, 9
 /* B5FC98 802419E8 50620001 */  beql      $v1, $v0, .L802419F0
 /* B5FC9C 802419EC 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s
index 2555fea14e..bb4478c630 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240D5C_B6680C.s
@@ -97,8 +97,8 @@ glabel func_80240D5C_B6680C
 /* B66970 80240EC0 45030001 */  bc1tl     .L80240EC8
 /* B66974 80240EC4 0000882D */   daddu    $s1, $zero, $zero
 .L80240EC8:
-/* B66978 80240EC8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* B6697C 80240ECC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* B66978 80240EC8 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* B6697C 80240ECC 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* B66980 80240ED0 24020009 */  addiu     $v0, $zero, 9
 /* B66984 80240ED4 50620001 */  beql      $v1, $v0, .L80240EDC
 /* B66988 80240ED8 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s
index 944b331f88..978858922d 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802407DC_B7103C
-/* B7103C 802407DC 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* B71040 802407E0 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* B7103C 802407DC 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* B71040 802407E0 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* B71044 802407E4 24020006 */  addiu     $v0, $zero, 6
 /* B71048 802407E8 54620003 */  bnel      $v1, $v0, .L802407F8
 /* B7104C 802407EC AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s
index c4ec0b37c7..e8c48eaf8b 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_12/B73570/func_802408DC_B7398C.s
@@ -97,8 +97,8 @@ glabel func_802408DC_B7398C
 /* B73AF0 80240A40 45030001 */  bc1tl     .L80240A48
 /* B73AF4 80240A44 0000882D */   daddu    $s1, $zero, $zero
 .L80240A48:
-/* B73AF8 80240A48 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* B73AFC 80240A4C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* B73AF8 80240A48 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* B73AFC 80240A4C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* B73B00 80240A50 24020009 */  addiu     $v0, $zero, 9
 /* B73B04 80240A54 50620001 */  beql      $v1, $v0, .L80240A5C
 /* B73B08 80240A58 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s
index 5d73240277..6511155f5e 100644
--- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s
+++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240730_8AAB80
-/* 8AAB80 80240730 3C028011 */  lui       $v0, %hi(D_8010EBB3)
-/* 8AAB84 80240734 8042EBB3 */  lb        $v0, %lo(D_8010EBB3)($v0)
+/* 8AAB80 80240730 3C028011 */  lui       $v0, %hi(D_8010EBB0+0x3)
+/* 8AAB84 80240734 8042EBB3 */  lb        $v0, %lo(D_8010EBB0+0x3)($v0)
 /* 8AAB88 80240738 38420006 */  xori      $v0, $v0, 6
 /* 8AAB8C 8024073C 2C420001 */  sltiu     $v0, $v0, 1
 /* 8AAB90 80240740 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s
index ef23504183..98dc0cd663 100644
--- a/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s
+++ b/ver/us/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240748_8AAB98.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240748_8AAB98
-/* 8AAB98 80240748 3C028011 */  lui       $v0, %hi(D_8010EBB3)
-/* 8AAB9C 8024074C 8042EBB3 */  lb        $v0, %lo(D_8010EBB3)($v0)
+/* 8AAB98 80240748 3C028011 */  lui       $v0, %hi(D_8010EBB0+0x3)
+/* 8AAB9C 8024074C 8042EBB3 */  lb        $v0, %lo(D_8010EBB0+0x3)($v0)
 /* 8AABA0 80240750 38420006 */  xori      $v0, $v0, 6
 /* 8AABA4 80240754 0002102B */  sltu      $v0, $zero, $v0
 /* 8AABA8 80240758 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s
index 409bf7b795..b6c664495f 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s
@@ -97,8 +97,8 @@ glabel func_80240A48_A49008
 /* A49174 80240BB4 00000000 */  nop
 /* A49178 80240BB8 4501000F */  bc1t      .L80240BF8
 /* A4917C 80240BBC 2402FFFF */   addiu    $v0, $zero, -1
-/* A49180 80240BC0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A49184 80240BC4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A49180 80240BC0 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A49184 80240BC4 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A49188 80240BC8 24020009 */  addiu     $v0, $zero, 9
 /* A4918C 80240BCC 10620009 */  beq       $v1, $v0, .L80240BF4
 /* A49190 80240BD0 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s
index 680b013091..804baa39f9 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802400A0_A4CAC0.s
@@ -97,8 +97,8 @@ glabel func_802400A0_A4CAC0
 /* A4CC2C 8024020C 00000000 */  nop
 /* A4CC30 80240210 4501000F */  bc1t      .L80240250
 /* A4CC34 80240214 2402FFFF */   addiu    $v0, $zero, -1
-/* A4CC38 80240218 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A4CC3C 8024021C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A4CC38 80240218 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A4CC3C 8024021C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A4CC40 80240220 24020009 */  addiu     $v0, $zero, 9
 /* A4CC44 80240224 10620009 */  beq       $v1, $v0, .L8024024C
 /* A4CC48 80240228 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s
index a5c0799117..f31b5efea0 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s
@@ -89,8 +89,8 @@ glabel func_802400A0_A4F0A0
 /* A4F1EC 802401EC 00000000 */  nop
 /* A4F1F0 802401F0 4501001F */  bc1t      .L80240270
 /* A4F1F4 802401F4 2402FFFF */   addiu    $v0, $zero, -1
-/* A4F1F8 802401F8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A4F1FC 802401FC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A4F1F8 802401F8 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A4F1FC 802401FC 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A4F200 80240200 24020009 */  addiu     $v0, $zero, 9
 /* A4F204 80240204 10620019 */  beq       $v1, $v0, .L8024026C
 /* A4F208 80240208 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s
index 0a9bdc84fe..81b184018c 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240310_A93A50.s
@@ -89,8 +89,8 @@ glabel func_80240310_A93A50
 /* A93B9C 8024045C 00000000 */  nop
 /* A93BA0 80240460 4501001F */  bc1t      .L802404E0
 /* A93BA4 80240464 2402FFFF */   addiu    $v0, $zero, -1
-/* A93BA8 80240468 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A93BAC 8024046C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A93BA8 80240468 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A93BAC 8024046C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A93BB0 80240470 24020009 */  addiu     $v0, $zero, 9
 /* A93BB4 80240474 10620019 */  beq       $v1, $v0, .L802404DC
 /* A93BB8 80240478 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s
index 39a1661d86..3d4e928001 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241D30_A95470.s
@@ -97,8 +97,8 @@ glabel func_80241D30_A95470
 /* A955DC 80241E9C 00000000 */  nop
 /* A955E0 80241EA0 4501000F */  bc1t      .L80241EE0
 /* A955E4 80241EA4 2402FFFF */   addiu    $v0, $zero, -1
-/* A955E8 80241EA8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A955EC 80241EAC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A955E8 80241EA8 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A955EC 80241EAC 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A955F0 80241EB0 24020009 */  addiu     $v0, $zero, 9
 /* A955F4 80241EB4 10620009 */  beq       $v1, $v0, .L80241EDC
 /* A955F8 80241EB8 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s
index 0e8570f193..47d244c960 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240170_A99700.s
@@ -89,8 +89,8 @@ glabel func_80240170_A99700
 /* A9984C 802402BC 00000000 */  nop
 /* A99850 802402C0 4501001F */  bc1t      .L80240340
 /* A99854 802402C4 2402FFFF */   addiu    $v0, $zero, -1
-/* A99858 802402C8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A9985C 802402CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A99858 802402C8 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A9985C 802402CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A99860 802402D0 24020009 */  addiu     $v0, $zero, 9
 /* A99864 802402D4 10620019 */  beq       $v1, $v0, .L8024033C
 /* A99868 802402D8 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s
index 984772a4c8..4388f9054d 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s
@@ -89,8 +89,8 @@ glabel func_80240170_A9EEB0
 /* A9EFFC 802402BC 00000000 */  nop
 /* A9F000 802402C0 4501001F */  bc1t      .L80240340
 /* A9F004 802402C4 2402FFFF */   addiu    $v0, $zero, -1
-/* A9F008 802402C8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A9F00C 802402CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A9F008 802402C8 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A9F00C 802402CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A9F010 802402D0 24020009 */  addiu     $v0, $zero, 9
 /* A9F014 802402D4 10620019 */  beq       $v1, $v0, .L8024033C
 /* A9F018 802402D8 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s
index 54613b69d7..13cd221e9f 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240444_A54D94.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240444_A54D94
-/* A54D94 80240444 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A54D98 80240448 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A54D94 80240444 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A54D98 80240448 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A54D9C 8024044C 24020008 */  addiu     $v0, $zero, 8
 /* A54DA0 80240450 54620003 */  bnel      $v1, $v0, .L80240460
 /* A54DA4 80240454 AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s
index 232793a4f4..42ca452250 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_80240444_A56364.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240444_A56364
-/* A56364 80240444 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A56368 80240448 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A56364 80240444 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A56368 80240448 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A5636C 8024044C 24020008 */  addiu     $v0, $zero, 8
 /* A56370 80240450 54620003 */  bnel      $v1, $v0, .L80240460
 /* A56374 80240454 AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s
index 9790f98216..d952675d70 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240840_A57CF0
-/* A57CF0 80240840 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A57CF4 80240844 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A57CF0 80240840 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A57CF4 80240844 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A57CF8 80240848 24020008 */  addiu     $v0, $zero, 8
 /* A57CFC 8024084C 54620003 */  bnel      $v1, $v0, .L8024085C
 /* A57D00 80240850 AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s
index 3a76ead061..a55d4f564c 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240000_A609D0.s
@@ -89,8 +89,8 @@ glabel func_80240000_A609D0
 /* A60B1C 8024014C 00000000 */  nop
 /* A60B20 80240150 4501001F */  bc1t      .L802401D0
 /* A60B24 80240154 2402FFFF */   addiu    $v0, $zero, -1
-/* A60B28 80240158 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A60B2C 8024015C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A60B28 80240158 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A60B2C 8024015C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A60B30 80240160 24020009 */  addiu     $v0, $zero, 9
 /* A60B34 80240164 10620019 */  beq       $v1, $v0, .L802401CC
 /* A60B38 80240168 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s
index a02155739e..d73d20541c 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s
@@ -97,8 +97,8 @@ glabel func_80240050_A640E0
 /* A6424C 802401BC 00000000 */  nop
 /* A64250 802401C0 4501000F */  bc1t      .L80240200
 /* A64254 802401C4 2402FFFF */   addiu    $v0, $zero, -1
-/* A64258 802401C8 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A6425C 802401CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A64258 802401C8 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A6425C 802401CC 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A64260 802401D0 24020009 */  addiu     $v0, $zero, 9
 /* A64264 802401D4 10620009 */  beq       $v1, $v0, .L802401FC
 /* A64268 802401D8 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s
index ac349f071e..b00aae99f2 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802400E0_A671E0.s
@@ -89,8 +89,8 @@ glabel func_802400E0_A671E0
 /* A6732C 8024022C 00000000 */  nop
 /* A67330 80240230 4501001F */  bc1t      .L802402B0
 /* A67334 80240234 2402FFFF */   addiu    $v0, $zero, -1
-/* A67338 80240238 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A6733C 8024023C 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A67338 80240238 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A6733C 8024023C 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A67340 80240240 24020009 */  addiu     $v0, $zero, 9
 /* A67344 80240244 10620019 */  beq       $v1, $v0, .L802402AC
 /* A67348 80240248 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s
index a60d737028..09445b3574 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80240AE4_A6EEC4.s
@@ -97,8 +97,8 @@ glabel func_80240AE4_A6EEC4
 /* A6F030 80240C50 00000000 */  nop
 /* A6F034 80240C54 4501000F */  bc1t      .L80240C94
 /* A6F038 80240C58 2402FFFF */   addiu    $v0, $zero, -1
-/* A6F03C 80240C5C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* A6F040 80240C60 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* A6F03C 80240C5C 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* A6F040 80240C60 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* A6F044 80240C64 24020009 */  addiu     $v0, $zero, 9
 /* A6F048 80240C68 10620009 */  beq       $v1, $v0, .L80240C90
 /* A6F04C 80240C6C 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s
index cb01327373..da7709abf2 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403B0_C5AAF0.s
@@ -5,8 +5,8 @@ glabel func_802403B0_C5AAF0
 /* C5AAF0 802403B0 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* C5AAF4 802403B4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* C5AAF8 802403B8 8C82000C */  lw        $v0, 0xc($a0)
-/* C5AAFC 802403BC 3C068011 */  lui       $a2, %hi(D_8010EBB3)
-/* C5AB00 802403C0 80C6EBB3 */  lb        $a2, %lo(D_8010EBB3)($a2)
+/* C5AAFC 802403BC 3C068011 */  lui       $a2, %hi(D_8010EBB0+0x3)
+/* C5AB00 802403C0 80C6EBB3 */  lb        $a2, %lo(D_8010EBB0+0x3)($a2)
 /* C5AB04 802403C4 0C0B2026 */  jal       set_variable
 /* C5AB08 802403C8 8C450000 */   lw       $a1, ($v0)
 /* C5AB0C 802403CC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s
index df1b6d0142..6a0a44dc10 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5CE70/func_80242730_C5CE70.s
@@ -34,8 +34,8 @@ glabel func_80242730_C5CE70
 /* C5CED8 80242798 08090A01 */  j         .L80242804
 /* C5CEDC 8024279C AC820000 */   sw       $v0, ($a0)
 .L802427A0:
-/* C5CEE0 802427A0 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* C5CEE4 802427A4 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* C5CEE0 802427A0 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* C5CEE4 802427A4 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* C5CEE8 802427A8 0C03BD17 */  jal       clear_partner_move_history
 /* C5CEEC 802427AC 8E040000 */   lw       $a0, ($s0)
 /* C5CEF0 802427B0 C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s
index d198d721fc..127ab7317f 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240E00_C61B10.s
@@ -97,8 +97,8 @@ glabel func_80240E00_C61B10
 /* C61C74 80240F64 45030001 */  bc1tl     .L80240F6C
 /* C61C78 80240F68 0000882D */   daddu    $s1, $zero, $zero
 .L80240F6C:
-/* C61C7C 80240F6C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C61C80 80240F70 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C61C7C 80240F6C 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C61C80 80240F70 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C61C84 80240F74 24020009 */  addiu     $v0, $zero, 9
 /* C61C88 80240F78 50620001 */  beql      $v1, $v0, .L80240F80
 /* C61C8C 80240F7C 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s
index cbcc600d4f..e306b62a51 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s
@@ -97,8 +97,8 @@ glabel func_80242744_C73BC4
 /* C73D28 802428A8 45030001 */  bc1tl     .L802428B0
 /* C73D2C 802428AC 0000882D */   daddu    $s1, $zero, $zero
 .L802428B0:
-/* C73D30 802428B0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C73D34 802428B4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C73D30 802428B0 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C73D34 802428B4 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C73D38 802428B8 24020009 */  addiu     $v0, $zero, 9
 /* C73D3C 802428BC 50620001 */  beql      $v1, $v0, .L802428C4
 /* C73D40 802428C0 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s
index c09ce5f0e8..172d6f8b0f 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80241228_C77F08.s
@@ -97,8 +97,8 @@ glabel func_80241228_C77F08
 /* C7806C 8024138C 45030001 */  bc1tl     .L80241394
 /* C78070 80241390 0000882D */   daddu    $s1, $zero, $zero
 .L80241394:
-/* C78074 80241394 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C78078 80241398 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C78074 80241394 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C78078 80241398 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C7807C 8024139C 24020009 */  addiu     $v0, $zero, 9
 /* C78080 802413A0 50620001 */  beql      $v1, $v0, .L802413A8
 /* C78084 802413A4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s
index b015c53977..4f544d581f 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240434_C805D4.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240434_C805D4
-/* C805D4 80240434 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C805D8 80240438 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C805D4 80240434 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C805D8 80240438 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C805DC 8024043C 24020008 */  addiu     $v0, $zero, 8
 /* C805E0 80240440 54620003 */  bnel      $v1, $v0, .L80240450
 /* C805E4 80240444 AC8000A8 */   sw       $zero, 0xa8($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s
index ca85d834f7..f093b3b3a0 100644
--- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s
+++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240518_C85FC8.s
@@ -97,8 +97,8 @@ glabel func_80240518_C85FC8
 /* C8612C 8024067C 45030001 */  bc1tl     .L80240684
 /* C86130 80240680 0000882D */   daddu    $s1, $zero, $zero
 .L80240684:
-/* C86134 80240684 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* C86138 80240688 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* C86134 80240684 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* C86138 80240688 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* C8613C 8024068C 24020009 */  addiu     $v0, $zero, 9
 /* C86140 80240690 50620001 */  beql      $v1, $v0, .L80240698
 /* C86144 80240694 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s
index 5d13e8d285..c6c7cb609c 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802419AC_84457C
-/* 84457C 802419AC 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* 844580 802419B0 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* 84457C 802419AC 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* 844580 802419B0 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* 844584 802419B4 24020009 */  addiu     $v0, $zero, 9
 /* 844588 802419B8 54620003 */  bnel      $v1, $v0, .L802419C8
 /* 84458C 802419BC AC800084 */   sw       $zero, 0x84($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s
index 0ebc79394a..03b3e859c5 100644
--- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s
+++ b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240708_B93B48.s
@@ -97,8 +97,8 @@ glabel func_80240708_B93B48
 /* B93CAC 8024086C 45030001 */  bc1tl     .L80240874
 /* B93CB0 80240870 0000882D */   daddu    $s1, $zero, $zero
 .L80240874:
-/* B93CB4 80240874 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* B93CB8 80240878 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* B93CB4 80240874 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* B93CB8 80240878 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* B93CBC 8024087C 24020009 */  addiu     $v0, $zero, 9
 /* B93CC0 80240880 50620001 */  beql      $v1, $v0, .L80240888
 /* B93CC4 80240884 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s
index 251ef34f85..052254d805 100644
--- a/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s
+++ b/ver/us/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s
@@ -97,8 +97,8 @@ glabel func_80240278_BA09A8
 /* BA0B0C 802403DC 45030001 */  bc1tl     .L802403E4
 /* BA0B10 802403E0 0000882D */   daddu    $s1, $zero, $zero
 .L802403E4:
-/* BA0B14 802403E4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* BA0B18 802403E8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* BA0B14 802403E4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* BA0B18 802403E8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* BA0B1C 802403EC 24020009 */  addiu     $v0, $zero, 9
 /* BA0B20 802403F0 50620001 */  beql      $v1, $v0, .L802403F8
 /* BA0B24 802403F4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s
index 397e3d9185..20a1999acf 100644
--- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s
+++ b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240778_BA4EF8.s
@@ -97,8 +97,8 @@ glabel func_80240778_BA4EF8
 /* BA505C 802408DC 45030001 */  bc1tl     .L802408E4
 /* BA5060 802408E0 0000882D */   daddu    $s1, $zero, $zero
 .L802408E4:
-/* BA5064 802408E4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* BA5068 802408E8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* BA5064 802408E4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* BA5068 802408E8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* BA506C 802408EC 24020009 */  addiu     $v0, $zero, 9
 /* BA5070 802408F0 50620001 */  beql      $v1, $v0, .L802408F8
 /* BA5074 802408F4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s
index e50d21a259..70bc74a557 100644
--- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s
+++ b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802417A0_BAF0E0.s
@@ -97,8 +97,8 @@ glabel func_802417A0_BAF0E0
 /* BAF244 80241904 45030001 */  bc1tl     .L8024190C
 /* BAF248 80241908 0000882D */   daddu    $s1, $zero, $zero
 .L8024190C:
-/* BAF24C 8024190C 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* BAF250 80241910 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* BAF24C 8024190C 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* BAF250 80241910 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* BAF254 80241914 24020009 */  addiu     $v0, $zero, 9
 /* BAF258 80241918 50620001 */  beql      $v1, $v0, .L80241920
 /* BAF25C 8024191C 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s
index f8f29e2ebc..03e55f55d5 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s
@@ -34,8 +34,8 @@ glabel func_802438D0_9DA8F0
 /* 9DA958 80243938 08090E69 */  j         .L802439A4
 /* 9DA95C 8024393C AC820000 */   sw       $v0, ($a0)
 .L80243940:
-/* 9DA960 80243940 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* 9DA964 80243944 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* 9DA960 80243940 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* 9DA964 80243944 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* 9DA968 80243948 0C03BD17 */  jal       clear_partner_move_history
 /* 9DA96C 8024394C 8E040000 */   lw       $a0, ($s0)
 /* 9DA970 80243950 C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s
index 2581c4fa15..c869b3ebb2 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241EE0_9FC6D0.s
@@ -34,8 +34,8 @@ glabel func_80241EE0_9FC6D0
 /* 9FC738 80241F48 080907ED */  j         .L80241FB4
 /* 9FC73C 80241F4C AC820000 */   sw       $v0, ($a0)
 .L80241F50:
-/* 9FC740 80241F50 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* 9FC744 80241F54 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* 9FC740 80241F50 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* 9FC744 80241F54 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* 9FC748 80241F58 0C03BD17 */  jal       clear_partner_move_history
 /* 9FC74C 80241F5C 8E040000 */   lw       $a0, ($s0)
 /* 9FC750 80241F60 C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s
index 92be31bc99..9bf3e46e84 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s
@@ -34,8 +34,8 @@ glabel func_80241FD0_9FC7C0
 /* 9FC828 80242038 08090829 */  j         .L802420A4
 /* 9FC82C 8024203C AC820000 */   sw       $v0, ($a0)
 .L80242040:
-/* 9FC830 80242040 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* 9FC834 80242044 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* 9FC830 80242040 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* 9FC834 80242044 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* 9FC838 80242048 0C03BD17 */  jal       clear_partner_move_history
 /* 9FC83C 8024204C 8E040000 */   lw       $a0, ($s0)
 /* 9FC840 80242050 C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s
index d9867237c6..e734fd059d 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241948_D9EE18.s
@@ -89,8 +89,8 @@ glabel func_80241948_D9EE18
 /* D9EF64 80241A94 00000000 */  nop
 /* D9EF68 80241A98 4501001F */  bc1t      .L80241B18
 /* D9EF6C 80241A9C 2402FFFF */   addiu    $v0, $zero, -1
-/* D9EF70 80241AA0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* D9EF74 80241AA4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* D9EF70 80241AA0 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* D9EF74 80241AA4 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* D9EF78 80241AA8 24020009 */  addiu     $v0, $zero, 9
 /* D9EF7C 80241AAC 10620019 */  beq       $v1, $v0, .L80241B14
 /* D9EF80 80241AB0 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s
index b390692a1a..85c8a2d815 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s
@@ -89,8 +89,8 @@ glabel func_80242358_DCF028
 /* DCF174 802424A4 00000000 */  nop
 /* DCF178 802424A8 4501001F */  bc1t      .L80242528
 /* DCF17C 802424AC 2402FFFF */   addiu    $v0, $zero, -1
-/* DCF180 802424B0 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* DCF184 802424B4 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* DCF180 802424B0 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* DCF184 802424B4 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* DCF188 802424B8 24020009 */  addiu     $v0, $zero, 9
 /* DCF18C 802424BC 10620019 */  beq       $v1, $v0, .L80242524
 /* DCF190 802424C0 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s
index 17d8c56d41..375494fb62 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_14/DE5810/func_80240590_DE5C40.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_80240590_DE5C40
-/* DE5C40 80240590 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* DE5C44 80240594 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* DE5C40 80240590 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* DE5C44 80240594 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* DE5C48 80240598 24020006 */  addiu     $v0, $zero, 6
 /* DE5C4C 8024059C 54620003 */  bnel      $v1, $v0, .L802405AC
 /* DE5C50 802405A0 AC800088 */   sw       $zero, 0x88($a0)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s
index 861d73df14..48021ac3cc 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s
@@ -89,8 +89,8 @@ glabel func_802424AC_DF134C
 /* DF1498 802425F8 00000000 */  nop
 /* DF149C 802425FC 4501001F */  bc1t      .L8024267C
 /* DF14A0 80242600 2402FFFF */   addiu    $v0, $zero, -1
-/* DF14A4 80242604 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* DF14A8 80242608 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* DF14A4 80242604 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* DF14A8 80242608 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* DF14AC 8024260C 24020009 */  addiu     $v0, $zero, 9
 /* DF14B0 80242610 10620019 */  beq       $v1, $v0, .L80242678
 /* DF14B4 80242614 24020007 */   addiu    $v0, $zero, 7
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s
index 93bc79f9de..2273d95f69 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s
@@ -97,8 +97,8 @@ glabel func_80241FB8_D8F208
 /* D8F36C 8024211C 45030001 */  bc1tl     .L80242124
 /* D8F370 80242120 0000882D */   daddu    $s1, $zero, $zero
 .L80242124:
-/* D8F374 80242124 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* D8F378 80242128 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* D8F374 80242124 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* D8F378 80242128 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* D8F37C 8024212C 24020009 */  addiu     $v0, $zero, 9
 /* D8F380 80242130 50620001 */  beql      $v1, $v0, .L80242138
 /* D8F384 80242134 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s b/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s
index dfed3dec57..c8f2eedc0f 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80241158_D94098.s
@@ -97,8 +97,8 @@ glabel func_80241158_D94098
 /* D941FC 802412BC 45030001 */  bc1tl     .L802412C4
 /* D94200 802412C0 0000882D */   daddu    $s1, $zero, $zero
 .L802412C4:
-/* D94204 802412C4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* D94208 802412C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* D94204 802412C4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* D94208 802412C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* D9420C 802412CC 24020009 */  addiu     $v0, $zero, 9
 /* D94210 802412D0 50620001 */  beql      $v1, $v0, .L802412D8
 /* D94214 802412D4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s b/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s
index ebc0a8a7b3..f20322fe26 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s
@@ -97,8 +97,8 @@ glabel func_80240258_D11318
 /* D1147C 802403BC 45030001 */  bc1tl     .L802403C4
 /* D11480 802403C0 0000882D */   daddu    $s1, $zero, $zero
 .L802403C4:
-/* D11484 802403C4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* D11488 802403C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* D11484 802403C4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* D11488 802403C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* D1148C 802403CC 24020009 */  addiu     $v0, $zero, 9
 /* D11490 802403D0 50620001 */  beql      $v1, $v0, .L802403D8
 /* D11494 802403D4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s
index 927e0fed47..5d7a2e87cf 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80240208_D189E8.s
@@ -97,8 +97,8 @@ glabel func_80240208_D189E8
 /* D18B4C 8024036C 45030001 */  bc1tl     .L80240374
 /* D18B50 80240370 0000882D */   daddu    $s1, $zero, $zero
 .L80240374:
-/* D18B54 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* D18B58 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* D18B54 80240374 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* D18B58 80240378 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* D18B5C 8024037C 24020009 */  addiu     $v0, $zero, 9
 /* D18B60 80240380 50620001 */  beql      $v1, $v0, .L80240388
 /* D18B64 80240384 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s
index 339a4faa03..170cbe25ed 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240858_D2C588.s
@@ -97,8 +97,8 @@ glabel func_80240858_D2C588
 /* D2C6EC 802409BC 45030001 */  bc1tl     .L802409C4
 /* D2C6F0 802409C0 0000882D */   daddu    $s1, $zero, $zero
 .L802409C4:
-/* D2C6F4 802409C4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* D2C6F8 802409C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* D2C6F4 802409C4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* D2C6F8 802409C8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* D2C6FC 802409CC 24020009 */  addiu     $v0, $zero, 9
 /* D2C700 802409D0 50620001 */  beql      $v1, $v0, .L802409D8
 /* D2C704 802409D4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s
index 33b5fa99e0..80b0f9366b 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s
@@ -97,8 +97,8 @@ glabel func_80240F48_D30BC8
 /* D30D2C 802410AC 45030001 */  bc1tl     .L802410B4
 /* D30D30 802410B0 0000882D */   daddu    $s1, $zero, $zero
 .L802410B4:
-/* D30D34 802410B4 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* D30D38 802410B8 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* D30D34 802410B4 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* D30D38 802410B8 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* D30D3C 802410BC 24020009 */  addiu     $v0, $zero, 9
 /* D30D40 802410C0 50620001 */  beql      $v1, $v0, .L802410C8
 /* D30D44 802410C4 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s b/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s
index d4dab51c83..b18a5aa314 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s
@@ -97,8 +97,8 @@ glabel func_802405D8_D37DD8
 /* D37F3C 8024073C 45030001 */  bc1tl     .L80240744
 /* D37F40 80240740 0000882D */   daddu    $s1, $zero, $zero
 .L80240744:
-/* D37F44 80240744 3C038011 */  lui       $v1, %hi(D_8010EBB3)
-/* D37F48 80240748 8063EBB3 */  lb        $v1, %lo(D_8010EBB3)($v1)
+/* D37F44 80240744 3C038011 */  lui       $v1, %hi(D_8010EBB0+0x3)
+/* D37F48 80240748 8063EBB3 */  lb        $v1, %lo(D_8010EBB0+0x3)($v1)
 /* D37F4C 8024074C 24020009 */  addiu     $v0, $zero, 9
 /* D37F50 80240750 50620001 */  beql      $v1, $v0, .L80240758
 /* D37F54 80240754 0000882D */   daddu    $s1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s
index 761355d31c..694677c415 100644
--- a/ver/us/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s
+++ b/ver/us/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s
@@ -33,8 +33,8 @@ glabel func_802409E0_86F4E0
 /* 86F544 80240A44 080902AC */  j         .L80240AB0
 /* 86F548 80240A48 AC820000 */   sw       $v0, ($a0)
 .L80240A4C:
-/* 86F54C 80240A4C 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* 86F550 80240A50 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* 86F54C 80240A4C 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* 86F550 80240A50 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* 86F554 80240A54 0C03BD17 */  jal       clear_partner_move_history
 /* 86F558 80240A58 8E040000 */   lw       $a0, ($s0)
 /* 86F55C 80240A5C C6200028 */  lwc1      $f0, 0x28($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s b/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s
index f53968402f..d107b78773 100644
--- a/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s
+++ b/ver/us/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s
@@ -37,8 +37,8 @@ glabel func_802400C0_9BD720
 /* 9BD790 80240130 C6200028 */  lwc1      $f0, 0x28($s1)
 /* 9BD794 80240134 3C0141F0 */  lui       $at, 0x41f0
 /* 9BD798 80240138 44811000 */  mtc1      $at, $f2
-/* 9BD79C 8024013C 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* 9BD7A0 80240140 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* 9BD79C 8024013C 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* 9BD7A0 80240140 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* 9BD7A4 80240144 46020001 */  sub.s     $f0, $f0, $f2
 /* 9BD7A8 80240148 8E040000 */  lw        $a0, ($s0)
 /* 9BD7AC 8024014C E4800038 */  swc1      $f0, 0x38($a0)
diff --git a/ver/us/asm/nonmatchings/world/partner/goombario/world_goombario_pre_battle.s b/ver/us/asm/nonmatchings/world/partner/goombario/world_goombario_pre_battle.s
deleted file mode 100644
index 02787887ac..0000000000
--- a/ver/us/asm/nonmatchings/world/partner/goombario/world_goombario_pre_battle.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel world_goombario_pre_battle
-/* 317ADC 802BDBBC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 317AE0 802BDBC0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 317AE4 802BDBC4 0080882D */  daddu     $s1, $a0, $zero
-/* 317AE8 802BDBC8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 317AEC 802BDBCC 3C108011 */  lui       $s0, %hi(D_8010EBB0)
-/* 317AF0 802BDBD0 2610EBB0 */  addiu     $s0, $s0, %lo(D_8010EBB0)
-/* 317AF4 802BDBD4 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 317AF8 802BDBD8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 317AFC 802BDBDC 82020000 */  lb        $v0, ($s0)
-/* 317B00 802BDBE0 1040000D */  beqz      $v0, .L802BDC18
-/* 317B04 802BDBE4 0200902D */   daddu    $s2, $s0, $zero
-/* 317B08 802BDBE8 0C009C22 */  jal       func_80027088
-/* 317B0C 802BDBEC 0000202D */   daddu    $a0, $zero, $zero
-/* 317B10 802BDBF0 0C038069 */  jal       enable_player_input
-/* 317B14 802BDBF4 00000000 */   nop
-/* 317B18 802BDBF8 0C0B4312 */  jal       CancelMessageAndBlock
-/* 317B1C 802BDBFC 00000000 */   nop
-/* 317B20 802BDC00 0C03BD17 */  jal       clear_partner_move_history
-/* 317B24 802BDC04 0220202D */   daddu    $a0, $s1, $zero
-/* 317B28 802BDC08 0220202D */  daddu     $a0, $s1, $zero
-/* 317B2C 802BDC0C A2000000 */  sb        $zero, ($s0)
-/* 317B30 802BDC10 0C00EB6B */  jal       disable_npc_blur
-/* 317B34 802BDC14 A2000003 */   sb       $zero, 3($s0)
-.L802BDC18:
-/* 317B38 802BDC18 24020001 */  addiu     $v0, $zero, 1
-/* 317B3C 802BDC1C A2420003 */  sb        $v0, 3($s2)
-/* 317B40 802BDC20 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 317B44 802BDC24 8FB20018 */  lw        $s2, 0x18($sp)
-/* 317B48 802BDC28 8FB10014 */  lw        $s1, 0x14($sp)
-/* 317B4C 802BDC2C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 317B50 802BDC30 03E00008 */  jr        $ra
-/* 317B54 802BDC34 27BD0020 */   addiu    $sp, $sp, 0x20
-/* 317B58 802BDC38 00000000 */  nop
-/* 317B5C 802BDC3C 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s
index b5e2080bb9..78c06e2783 100644
--- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s
+++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BD2B4_31CE24.s
@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802BD2B4_31CE24
-/* 31CE24 802BD2B4 3C028011 */  lui       $v0, %hi(D_8010EBB1)
-/* 31CE28 802BD2B8 8042EBB1 */  lb        $v0, %lo(D_8010EBB1)($v0)
+/* 31CE24 802BD2B4 3C028011 */  lui       $v0, %hi(D_8010EBB0+0x1)
+/* 31CE28 802BD2B8 8042EBB1 */  lb        $v0, %lo(D_8010EBB0+0x1)($v0)
 /* 31CE2C 802BD2BC 27BDFFC8 */  addiu     $sp, $sp, -0x38
 /* 31CE30 802BD2C0 AFB00018 */  sw        $s0, 0x18($sp)
 /* 31CE34 802BD2C4 3C108011 */  lui       $s0, %hi(gPlayerData)
diff --git a/ver/us/asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s b/ver/us/asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s
index b85446f20b..0cc6280b07 100644
--- a/ver/us/asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s
+++ b/ver/us/asm/nonmatchings/world/partner/watt/func_802BE070_31DBE0.s
@@ -70,8 +70,8 @@ glabel func_802BE070_31DBE0
 /* 31DCD4 802BE164 00000000 */  nop
 /* 31DCD8 802BE168 4600A502 */  mul.s     $f20, $f20, $f0
 /* 31DCDC 802BE16C 00000000 */  nop
-/* 31DCE0 802BE170 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* 31DCE4 802BE174 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
+/* 31DCE0 802BE170 3C108011 */  lui       $s0, %hi(wPartnerNpc)
+/* 31DCE4 802BE174 2610C930 */  addiu     $s0, $s0, %lo(wPartnerNpc)
 /* 31DCE8 802BE178 3C0143B4 */  lui       $at, 0x43b4
 /* 31DCEC 802BE17C 44810000 */  mtc1      $at, $f0
 /* 31DCF0 802BE180 8E120000 */  lw        $s2, ($s0)
diff --git a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s
index df42ccc08f..2740889716 100644
--- a/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s
+++ b/ver/us/asm/nonmatchings/world/partners/_use_partner_ability.s
@@ -131,8 +131,8 @@ glabel L800EA83C_83CEC
 /* 83D54 800EA8A4 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
 /* 83D58 800EA8A8 0C0B102B */  jal       kill_script_by_ID
 /* 83D5C 800EA8AC 8E040000 */   lw       $a0, ($s0)
-/* 83D60 800EA8B0 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 83D64 800EA8B4 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 83D60 800EA8B0 3C028011 */  lui       $v0, %hi(wPartner)
+/* 83D64 800EA8B4 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 83D68 800EA8B8 24050014 */  addiu     $a1, $zero, 0x14
 /* 83D6C 800EA8BC 8C440020 */  lw        $a0, 0x20($v0)
 /* 83D70 800EA8C0 0C0B0CF8 */  jal       start_script
@@ -141,8 +141,8 @@ glabel L800EA83C_83CEC
 /* 83D7C 800EA8CC 3C018011 */  lui       $at, %hi(D_8010CFD4)
 /* 83D80 800EA8D0 AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
 /* 83D84 800EA8D4 AE030000 */  sw        $v1, ($s0)
-/* 83D88 800EA8D8 3C058011 */  lui       $a1, %hi(D_8010C930)
-/* 83D8C 800EA8DC 8CA5C930 */  lw        $a1, %lo(D_8010C930)($a1)
+/* 83D88 800EA8D8 3C058011 */  lui       $a1, %hi(wPartnerNpc)
+/* 83D8C 800EA8DC 8CA5C930 */  lw        $a1, %lo(wPartnerNpc)($a1)
 /* 83D90 800EA8E0 2403000A */  addiu     $v1, $zero, 0xa
 /* 83D94 800EA8E4 A0430004 */  sb        $v1, 4($v0)
 /* 83D98 800EA8E8 8E230000 */  lw        $v1, ($s1)
@@ -172,10 +172,10 @@ glabel L800EA83C_83CEC
 /* 83DF4 800EA944 A2620012 */   sb       $v0, 0x12($s3)
 /* 83DF8 800EA948 0C05272D */  jal       play_sound
 /* 83DFC 800EA94C 2404000E */   addiu    $a0, $zero, 0xe
-/* 83E00 800EA950 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 83E04 800EA954 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 83E08 800EA958 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 83E0C 800EA95C 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
+/* 83E00 800EA950 3C028011 */  lui       $v0, %hi(wPartner)
+/* 83E04 800EA954 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
+/* 83E08 800EA958 3C048011 */  lui       $a0, %hi(wPartnerNpc)
+/* 83E0C 800EA95C 8C84C930 */  lw        $a0, %lo(wPartnerNpc)($a0)
 /* 83E10 800EA960 8C420010 */  lw        $v0, 0x10($v0)
 /* 83E14 800EA964 0040F809 */  jalr      $v0
 /* 83E18 800EA968 00000000 */   nop
@@ -183,15 +183,15 @@ glabel L800EA83C_83CEC
 /* 83E20 800EA970 24420001 */  addiu     $v0, $v0, 1
 /* 83E24 800EA974 AE220000 */  sw        $v0, ($s1)
 .L800EA978:
-/* 83E28 800EA978 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 83E2C 800EA97C 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 83E28 800EA978 3C028011 */  lui       $v0, %hi(wPartner)
+/* 83E2C 800EA97C 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 83E30 800EA980 24050014 */  addiu     $a1, $zero, 0x14
 /* 83E34 800EA984 8C440014 */  lw        $a0, 0x14($v0)
 /* 83E38 800EA988 0C0B0CF8 */  jal       start_script
 /* 83E3C 800EA98C 24060020 */   addiu    $a2, $zero, 0x20
 /* 83E40 800EA990 8C430144 */  lw        $v1, 0x144($v0)
-/* 83E44 800EA994 3C068011 */  lui       $a2, %hi(D_8010C930)
-/* 83E48 800EA998 8CC6C930 */  lw        $a2, %lo(D_8010C930)($a2)
+/* 83E44 800EA994 3C068011 */  lui       $a2, %hi(wPartnerNpc)
+/* 83E48 800EA998 8CC6C930 */  lw        $a2, %lo(wPartnerNpc)($a2)
 /* 83E4C 800EA99C 3C058011 */  lui       $a1, %hi(D_8010CD34)
 /* 83E50 800EA9A0 24A5CD34 */  addiu     $a1, $a1, %lo(D_8010CD34)
 /* 83E54 800EA9A4 3C018011 */  lui       $at, %hi(D_8010CFD4)
@@ -215,13 +215,13 @@ glabel L800EA83C_83CEC
 /* 83E98 800EA9E8 8E040000 */   lw       $a0, ($s0)
 /* 83E9C 800EA9EC 144001D7 */  bnez      $v0, L800EB14C_845FC
 /* 83EA0 800EA9F0 24050014 */   addiu    $a1, $zero, 0x14
-/* 83EA4 800EA9F4 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 83EA8 800EA9F8 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 83EA4 800EA9F4 3C028011 */  lui       $v0, %hi(wPartner)
+/* 83EA8 800EA9F8 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 83EAC 800EA9FC 8C440018 */  lw        $a0, 0x18($v0)
 /* 83EB0 800EAA00 0C0B0CF8 */  jal       start_script
 /* 83EB4 800EAA04 24060020 */   addiu    $a2, $zero, 0x20
-/* 83EB8 800EAA08 3C038011 */  lui       $v1, %hi(D_8010C930)
-/* 83EBC 800EAA0C 8C63C930 */  lw        $v1, %lo(D_8010C930)($v1)
+/* 83EB8 800EAA08 3C038011 */  lui       $v1, %hi(wPartnerNpc)
+/* 83EBC 800EAA0C 8C63C930 */  lw        $v1, %lo(wPartnerNpc)($v1)
 /* 83EC0 800EAA10 8C440144 */  lw        $a0, 0x144($v0)
 /* 83EC4 800EAA14 3C018011 */  lui       $at, %hi(D_8010CFD4)
 /* 83EC8 800EAA18 AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
@@ -276,8 +276,8 @@ glabel L800EAA48_83EF8
 /* 83F7C 800EAACC AC22CFD8 */  sw        $v0, %lo(D_8010CFD8)($at)
 /* 83F80 800EAAD0 0C03A974 */  jal       load_partner_npc
 /* 83F84 800EAAD4 A2620012 */   sb       $v0, 0x12($s3)
-/* 83F88 800EAAD8 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 83F8C 800EAADC 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
+/* 83F88 800EAAD8 3C048011 */  lui       $a0, %hi(wPartnerNpc)
+/* 83F8C 800EAADC 8C84C930 */  lw        $a0, %lo(wPartnerNpc)($a0)
 /* 83F90 800EAAE0 3C018010 */  lui       $at, %hi(D_800F833C)
 /* 83F94 800EAAE4 C422833C */  lwc1      $f2, %lo(D_800F833C)($at)
 /* 83F98 800EAAE8 3C018010 */  lui       $at, %hi(D_800F8340)
@@ -286,8 +286,8 @@ glabel L800EAA48_83EF8
 /* 83FA4 800EAAF4 C4268344 */  lwc1      $f6, %lo(D_800F8344)($at)
 /* 83FA8 800EAAF8 3C013F80 */  lui       $at, 0x3f80
 /* 83FAC 800EAAFC 44810000 */  mtc1      $at, $f0
-/* 83FB0 800EAB00 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 83FB4 800EAB04 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 83FB0 800EAB00 3C028011 */  lui       $v0, %hi(wPartner)
+/* 83FB4 800EAB04 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 83FB8 800EAB08 E4820038 */  swc1      $f2, 0x38($a0)
 /* 83FBC 800EAB0C E484003C */  swc1      $f4, 0x3c($a0)
 /* 83FC0 800EAB10 E4860040 */  swc1      $f6, 0x40($a0)
@@ -305,13 +305,13 @@ glabel L800EAA48_83EF8
 /* 83FF0 800EAB40 0803AC14 */  j         .L800EB050
 /* 83FF4 800EAB44 AC620000 */   sw       $v0, ($v1)
 .L800EAB48:
-/* 83FF8 800EAB48 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 83FFC 800EAB4C 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 83FF8 800EAB48 3C028011 */  lui       $v0, %hi(wPartner)
+/* 83FFC 800EAB4C 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 84000 800EAB50 8C440018 */  lw        $a0, 0x18($v0)
 /* 84004 800EAB54 0C0B0CF8 */  jal       start_script
 /* 84008 800EAB58 24060020 */   addiu    $a2, $zero, 0x20
-/* 8400C 800EAB5C 3C038011 */  lui       $v1, %hi(D_8010C930)
-/* 84010 800EAB60 8C63C930 */  lw        $v1, %lo(D_8010C930)($v1)
+/* 8400C 800EAB5C 3C038011 */  lui       $v1, %hi(wPartnerNpc)
+/* 84010 800EAB60 8C63C930 */  lw        $v1, %lo(wPartnerNpc)($v1)
 /* 84014 800EAB64 8C440144 */  lw        $a0, 0x144($v0)
 /* 84018 800EAB68 3C018011 */  lui       $at, %hi(D_8010CFD4)
 /* 8401C 800EAB6C AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
@@ -342,8 +342,8 @@ glabel L800EAB90_84040
 /* 84078 800EABC8 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
 /* 8407C 800EABCC 0C0B102B */  jal       kill_script_by_ID
 /* 84080 800EABD0 8E040000 */   lw       $a0, ($s0)
-/* 84084 800EABD4 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84088 800EABD8 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 84084 800EABD4 3C028011 */  lui       $v0, %hi(wPartner)
+/* 84088 800EABD8 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 8408C 800EABDC 8C440020 */  lw        $a0, 0x20($v0)
 /* 84090 800EABE0 0803ABCE */  j         .L800EAF38
 /* 84094 800EABE4 24050014 */   addiu    $a1, $zero, 0x14
@@ -413,10 +413,10 @@ glabel L800EAC7C_8412C
 /* 84180 800EACD0 AC22CFD8 */  sw        $v0, %lo(D_8010CFD8)($at)
 /* 84184 800EACD4 0C03A974 */  jal       load_partner_npc
 /* 84188 800EACD8 A2620012 */   sb       $v0, 0x12($s3)
-/* 8418C 800EACDC 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84190 800EACE0 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 84194 800EACE4 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 84198 800EACE8 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
+/* 8418C 800EACDC 3C028011 */  lui       $v0, %hi(wPartner)
+/* 84190 800EACE0 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
+/* 84194 800EACE4 3C048011 */  lui       $a0, %hi(wPartnerNpc)
+/* 84198 800EACE8 8C84C930 */  lw        $a0, %lo(wPartnerNpc)($a0)
 /* 8419C 800EACEC 8C420010 */  lw        $v0, 0x10($v0)
 /* 841A0 800EACF0 0040F809 */  jalr      $v0
 /* 841A4 800EACF4 00000000 */   nop
@@ -424,15 +424,15 @@ glabel L800EAC7C_8412C
 /* 841AC 800EACFC 24420001 */  addiu     $v0, $v0, 1
 /* 841B0 800EAD00 AE020000 */  sw        $v0, ($s0)
 .L800EAD04:
-/* 841B4 800EAD04 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 841B8 800EAD08 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 841B4 800EAD04 3C028011 */  lui       $v0, %hi(wPartner)
+/* 841B8 800EAD08 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 841BC 800EAD0C 24050014 */  addiu     $a1, $zero, 0x14
 /* 841C0 800EAD10 8C440014 */  lw        $a0, 0x14($v0)
 /* 841C4 800EAD14 0C0B0CF8 */  jal       start_script
 /* 841C8 800EAD18 24060020 */   addiu    $a2, $zero, 0x20
 /* 841CC 800EAD1C 8C430144 */  lw        $v1, 0x144($v0)
-/* 841D0 800EAD20 3C058011 */  lui       $a1, %hi(D_8010C930)
-/* 841D4 800EAD24 8CA5C930 */  lw        $a1, %lo(D_8010C930)($a1)
+/* 841D0 800EAD20 3C058011 */  lui       $a1, %hi(wPartnerNpc)
+/* 841D4 800EAD24 8CA5C930 */  lw        $a1, %lo(wPartnerNpc)($a1)
 /* 841D8 800EAD28 3C048011 */  lui       $a0, %hi(D_8010CD34)
 /* 841DC 800EAD2C 2484CD34 */  addiu     $a0, $a0, %lo(D_8010CD34)
 /* 841E0 800EAD30 3C018011 */  lui       $at, %hi(D_8010CFD4)
@@ -453,13 +453,13 @@ glabel L800EAC7C_8412C
 /* 84218 800EAD68 8E040000 */   lw       $a0, ($s0)
 /* 8421C 800EAD6C 144000F7 */  bnez      $v0, L800EB14C_845FC
 /* 84220 800EAD70 24050014 */   addiu    $a1, $zero, 0x14
-/* 84224 800EAD74 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84228 800EAD78 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 84224 800EAD74 3C028011 */  lui       $v0, %hi(wPartner)
+/* 84228 800EAD78 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 8422C 800EAD7C 8C440018 */  lw        $a0, 0x18($v0)
 /* 84230 800EAD80 0C0B0CF8 */  jal       start_script
 /* 84234 800EAD84 24060020 */   addiu    $a2, $zero, 0x20
-/* 84238 800EAD88 3C038011 */  lui       $v1, %hi(D_8010C930)
-/* 8423C 800EAD8C 8C63C930 */  lw        $v1, %lo(D_8010C930)($v1)
+/* 84238 800EAD88 3C038011 */  lui       $v1, %hi(wPartnerNpc)
+/* 8423C 800EAD8C 8C63C930 */  lw        $v1, %lo(wPartnerNpc)($v1)
 /* 84240 800EAD90 8C440144 */  lw        $a0, 0x144($v0)
 /* 84244 800EAD94 3C018011 */  lui       $at, %hi(D_8010CFD4)
 /* 84248 800EAD98 AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
@@ -494,8 +494,8 @@ glabel L800EADC0_84270
 /* 842B4 800EAE04 AC22CFD8 */  sw        $v0, %lo(D_8010CFD8)($at)
 /* 842B8 800EAE08 0C03A974 */  jal       load_partner_npc
 /* 842BC 800EAE0C A2620012 */   sb       $v0, 0x12($s3)
-/* 842C0 800EAE10 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 842C4 800EAE14 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
+/* 842C0 800EAE10 3C048011 */  lui       $a0, %hi(wPartnerNpc)
+/* 842C4 800EAE14 8C84C930 */  lw        $a0, %lo(wPartnerNpc)($a0)
 /* 842C8 800EAE18 3C018010 */  lui       $at, %hi(D_800F833C)
 /* 842CC 800EAE1C C422833C */  lwc1      $f2, %lo(D_800F833C)($at)
 /* 842D0 800EAE20 3C018010 */  lui       $at, %hi(D_800F8340)
@@ -504,8 +504,8 @@ glabel L800EADC0_84270
 /* 842DC 800EAE2C C4268344 */  lwc1      $f6, %lo(D_800F8344)($at)
 /* 842E0 800EAE30 3C013F80 */  lui       $at, 0x3f80
 /* 842E4 800EAE34 44810000 */  mtc1      $at, $f0
-/* 842E8 800EAE38 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 842EC 800EAE3C 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 842E8 800EAE38 3C028011 */  lui       $v0, %hi(wPartner)
+/* 842EC 800EAE3C 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 842F0 800EAE40 E4820038 */  swc1      $f2, 0x38($a0)
 /* 842F4 800EAE44 E484003C */  swc1      $f4, 0x3c($a0)
 /* 842F8 800EAE48 E4860040 */  swc1      $f6, 0x40($a0)
@@ -521,14 +521,14 @@ glabel L800EADC0_84270
 /* 84320 800EAE70 0803AC53 */  j         L800EB14C_845FC
 /* 84324 800EAE74 AE220000 */   sw       $v0, ($s1)
 .L800EAE78:
-/* 84328 800EAE78 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 8432C 800EAE7C 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 84328 800EAE78 3C028011 */  lui       $v0, %hi(wPartner)
+/* 8432C 800EAE7C 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 84330 800EAE80 8C440018 */  lw        $a0, 0x18($v0)
 /* 84334 800EAE84 0C0B0CF8 */  jal       start_script
 /* 84338 800EAE88 24060020 */   addiu    $a2, $zero, 0x20
 /* 8433C 800EAE8C 8C430144 */  lw        $v1, 0x144($v0)
-/* 84340 800EAE90 3C058011 */  lui       $a1, %hi(D_8010C930)
-/* 84344 800EAE94 24A5C930 */  addiu     $a1, $a1, %lo(D_8010C930)
+/* 84340 800EAE90 3C058011 */  lui       $a1, %hi(wPartnerNpc)
+/* 84344 800EAE94 24A5C930 */  addiu     $a1, $a1, %lo(wPartnerNpc)
 /* 84348 800EAE98 3C018011 */  lui       $at, %hi(D_8010CFD4)
 /* 8434C 800EAE9C AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
 /* 84350 800EAEA0 3C018011 */  lui       $at, %hi(D_8010CFDC)
@@ -567,8 +567,8 @@ glabel L800EAEF4_843A4
 /* 843CC 800EAF1C 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
 /* 843D0 800EAF20 0C0B102B */  jal       kill_script_by_ID
 /* 843D4 800EAF24 8E040000 */   lw       $a0, ($s0)
-/* 843D8 800EAF28 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 843DC 800EAF2C 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 843D8 800EAF28 3C028011 */  lui       $v0, %hi(wPartner)
+/* 843DC 800EAF2C 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 843E0 800EAF30 24050014 */  addiu     $a1, $zero, 0x14
 /* 843E4 800EAF34 8C44001C */  lw        $a0, 0x1c($v0)
 .L800EAF38:
@@ -578,8 +578,8 @@ glabel L800EAEF4_843A4
 /* 843F4 800EAF44 3C018011 */  lui       $at, %hi(D_8010CFD4)
 /* 843F8 800EAF48 AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
 /* 843FC 800EAF4C AE030000 */  sw        $v1, ($s0)
-/* 84400 800EAF50 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 84404 800EAF54 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
+/* 84400 800EAF50 3C048011 */  lui       $a0, %hi(wPartnerNpc)
+/* 84404 800EAF54 8C84C930 */  lw        $a0, %lo(wPartnerNpc)($a0)
 /* 84408 800EAF58 2403000A */  addiu     $v1, $zero, 0xa
 /* 8440C 800EAF5C A0430004 */  sb        $v1, 4($v0)
 /* 84410 800EAF60 8E230000 */  lw        $v1, ($s1)
@@ -594,13 +594,13 @@ glabel L800EAEF4_843A4
 /* 84430 800EAF80 8E240000 */   lw       $a0, ($s1)
 /* 84434 800EAF84 14400071 */  bnez      $v0, L800EB14C_845FC
 /* 84438 800EAF88 24050014 */   addiu    $a1, $zero, 0x14
-/* 8443C 800EAF8C 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84440 800EAF90 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 8443C 800EAF8C 3C028011 */  lui       $v0, %hi(wPartner)
+/* 84440 800EAF90 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 84444 800EAF94 8C440018 */  lw        $a0, 0x18($v0)
 /* 84448 800EAF98 0C0B0CF8 */  jal       start_script
 /* 8444C 800EAF9C 24060020 */   addiu    $a2, $zero, 0x20
-/* 84450 800EAFA0 3C038011 */  lui       $v1, %hi(D_8010C930)
-/* 84454 800EAFA4 8C63C930 */  lw        $v1, %lo(D_8010C930)($v1)
+/* 84450 800EAFA0 3C038011 */  lui       $v1, %hi(wPartnerNpc)
+/* 84454 800EAFA4 8C63C930 */  lw        $v1, %lo(wPartnerNpc)($v1)
 /* 84458 800EAFA8 8C440144 */  lw        $a0, 0x144($v0)
 /* 8445C 800EAFAC 3C018011 */  lui       $at, %hi(D_8010CFD4)
 /* 84460 800EAFB0 AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
@@ -634,10 +634,10 @@ glabel L800EAFD0_84480
 .L800EB018:
 /* 844C8 800EB018 0C03805E */  jal       disable_player_input
 /* 844CC 800EB01C 00000000 */   nop
-/* 844D0 800EB020 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 844D4 800EB024 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 844D8 800EB028 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 844DC 800EB02C 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
+/* 844D0 800EB020 3C028011 */  lui       $v0, %hi(wPartner)
+/* 844D4 800EB024 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
+/* 844D8 800EB028 3C048011 */  lui       $a0, %hi(wPartnerNpc)
+/* 844DC 800EB02C 8C84C930 */  lw        $a0, %lo(wPartnerNpc)($a0)
 /* 844E0 800EB030 8C420010 */  lw        $v0, 0x10($v0)
 /* 844E4 800EB034 0040F809 */  jalr      $v0
 /* 844E8 800EB038 00000000 */   nop
@@ -656,8 +656,8 @@ glabel L800EAFD0_84480
 /* 84510 800EB060 80A20000 */  lb        $v0, ($a1)
 /* 84514 800EB064 10510019 */  beq       $v0, $s1, .L800EB0CC
 /* 84518 800EB068 24050014 */   addiu    $a1, $zero, 0x14
-/* 8451C 800EB06C 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84520 800EB070 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 8451C 800EB06C 3C028011 */  lui       $v0, %hi(wPartner)
+/* 84520 800EB070 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 84524 800EB074 C4C00028 */  lwc1      $f0, 0x28($a2)
 /* 84528 800EB078 C4C2002C */  lwc1      $f2, 0x2c($a2)
 /* 8452C 800EB07C C4C40030 */  lwc1      $f4, 0x30($a2)
@@ -670,8 +670,8 @@ glabel L800EAFD0_84480
 /* 84548 800EB098 E4248344 */  swc1      $f4, %lo(D_800F8344)($at)
 /* 8454C 800EB09C 0C0B0CF8 */  jal       start_script
 /* 84550 800EB0A0 24060020 */   addiu    $a2, $zero, 0x20
-/* 84554 800EB0A4 3C038011 */  lui       $v1, %hi(D_8010C930)
-/* 84558 800EB0A8 8C63C930 */  lw        $v1, %lo(D_8010C930)($v1)
+/* 84554 800EB0A4 3C038011 */  lui       $v1, %hi(wPartnerNpc)
+/* 84558 800EB0A8 8C63C930 */  lw        $v1, %lo(wPartnerNpc)($v1)
 /* 8455C 800EB0AC 8C440144 */  lw        $a0, 0x144($v0)
 /* 84560 800EB0B0 3C018011 */  lui       $at, %hi(D_8010CFD4)
 /* 84564 800EB0B4 AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
diff --git a/ver/us/asm/nonmatchings/world/partners/enable_partner_ai.s b/ver/us/asm/nonmatchings/world/partners/enable_partner_ai.s
deleted file mode 100644
index b0ddacbb22..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/enable_partner_ai.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel enable_partner_ai
-/* 887D8 800EF328 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 887DC 800EF32C AFB00010 */  sw        $s0, 0x10($sp)
-/* 887E0 800EF330 3C108011 */  lui       $s0, %hi(D_8010C930)
-/* 887E4 800EF334 2610C930 */  addiu     $s0, $s0, %lo(D_8010C930)
-/* 887E8 800EF338 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 887EC 800EF33C 8E040000 */  lw        $a0, ($s0)
-/* 887F0 800EF340 3C018011 */  lui       $at, %hi(D_8010CFC8)
-/* 887F4 800EF344 A420CFC8 */  sh        $zero, %lo(D_8010CFC8)($at)
-/* 887F8 800EF348 0C03BD17 */  jal       clear_partner_move_history
-/* 887FC 800EF34C 00000000 */   nop
-/* 88800 800EF350 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 88804 800EF354 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 88808 800EF358 8C42000C */  lw        $v0, 0xc($v0)
-/* 8880C 800EF35C 14400006 */  bnez      $v0, .L800EF378
-/* 88810 800EF360 00000000 */   nop
-/* 88814 800EF364 8E040000 */  lw        $a0, ($s0)
-/* 88818 800EF368 0C03AE2A */  jal       enable_partner_walking
-/* 8881C 800EF36C 0000282D */   daddu    $a1, $zero, $zero
-/* 88820 800EF370 0803BCE1 */  j         .L800EF384
-/* 88824 800EF374 00000000 */   nop
-.L800EF378:
-/* 88828 800EF378 8E040000 */  lw        $a0, ($s0)
-/* 8882C 800EF37C 0C03B4C4 */  jal       enable_partner_flying
-/* 88830 800EF380 0000282D */   daddu    $a1, $zero, $zero
-.L800EF384:
-/* 88834 800EF384 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 88838 800EF388 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8883C 800EF38C 03E00008 */  jr        $ra
-/* 88840 800EF390 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/partners/func_800EB168.s b/ver/us/asm/nonmatchings/world/partners/func_800EB168.s
deleted file mode 100644
index 3ace714dce..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/func_800EB168.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_800EB168
-/* 84618 800EB168 3C038011 */  lui       $v1, %hi(D_8010CFD8)
-/* 8461C 800EB16C 8C63CFD8 */  lw        $v1, %lo(D_8010CFD8)($v1)
-/* 84620 800EB170 3C058011 */  lui       $a1, %hi(gPlayerStatus)
-/* 84624 800EB174 24A5EFC8 */  addiu     $a1, $a1, %lo(gPlayerStatus)
-/* 84628 800EB178 1064000C */  beq       $v1, $a0, .L800EB1AC
-/* 8462C 800EB17C 24020001 */   addiu    $v0, $zero, 1
-/* 84630 800EB180 3C018011 */  lui       $at, %hi(D_8010CFE0)
-/* 84634 800EB184 AC22CFE0 */  sw        $v0, %lo(D_8010CFE0)($at)
-/* 84638 800EB188 3C018011 */  lui       $at, %hi(D_8010CFE4)
-/* 8463C 800EB18C AC24CFE4 */  sw        $a0, %lo(D_8010CFE4)($at)
-/* 84640 800EB190 10600008 */  beqz      $v1, .L800EB1B4
-/* 84644 800EB194 00000000 */   nop
-/* 84648 800EB198 10800009 */  beqz      $a0, .L800EB1C0
-/* 8464C 800EB19C 24020004 */   addiu    $v0, $zero, 4
-/* 84650 800EB1A0 24020003 */  addiu     $v0, $zero, 3
-/* 84654 800EB1A4 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 84658 800EB1A8 AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-.L800EB1AC:
-/* 8465C 800EB1AC 03E00008 */  jr        $ra
-/* 84660 800EB1B0 00000000 */   nop
-.L800EB1B4:
-/* 84664 800EB1B4 14800006 */  bnez      $a0, .L800EB1D0
-/* 84668 800EB1B8 24020006 */   addiu    $v0, $zero, 6
-/* 8466C 800EB1BC 24020004 */  addiu     $v0, $zero, 4
-.L800EB1C0:
-/* 84670 800EB1C0 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 84674 800EB1C4 AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 84678 800EB1C8 03E00008 */  jr        $ra
-/* 8467C 800EB1CC 00000000 */   nop
-.L800EB1D0:
-/* 84680 800EB1D0 C4A00028 */  lwc1      $f0, 0x28($a1)
-/* 84684 800EB1D4 C4A2002C */  lwc1      $f2, 0x2c($a1)
-/* 84688 800EB1D8 C4A40030 */  lwc1      $f4, 0x30($a1)
-/* 8468C 800EB1DC 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 84690 800EB1E0 AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 84694 800EB1E4 3C018010 */  lui       $at, %hi(D_800F833C)
-/* 84698 800EB1E8 E420833C */  swc1      $f0, %lo(D_800F833C)($at)
-/* 8469C 800EB1EC 3C018010 */  lui       $at, %hi(D_800F8340)
-/* 846A0 800EB1F0 E4228340 */  swc1      $f2, %lo(D_800F8340)($at)
-/* 846A4 800EB1F4 3C018010 */  lui       $at, %hi(D_800F8344)
-/* 846A8 800EB1F8 03E00008 */  jr        $ra
-/* 846AC 800EB1FC E4248344 */   swc1     $f4, %lo(D_800F8344)($at)
diff --git a/ver/us/asm/nonmatchings/world/partners/func_800EB200.s b/ver/us/asm/nonmatchings/world/partners/func_800EB200.s
deleted file mode 100644
index 980c7e294b..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/func_800EB200.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_800EB200
-/* 846B0 800EB200 3C058011 */  lui       $a1, %hi(gPlayerStatus)
-/* 846B4 800EB204 24A5EFC8 */  addiu     $a1, $a1, %lo(gPlayerStatus)
-/* 846B8 800EB208 3C038011 */  lui       $v1, %hi(D_8010CFD8)
-/* 846BC 800EB20C 8C63CFD8 */  lw        $v1, %lo(D_8010CFD8)($v1)
-/* 846C0 800EB210 3C068011 */  lui       $a2, %hi(D_8010EBB0)
-/* 846C4 800EB214 24C6EBB0 */  addiu     $a2, $a2, %lo(D_8010EBB0)
-/* 846C8 800EB218 1064000D */  beq       $v1, $a0, .L800EB250
-/* 846CC 800EB21C 24020001 */   addiu    $v0, $zero, 1
-/* 846D0 800EB220 3C018011 */  lui       $at, %hi(D_8010CFE0)
-/* 846D4 800EB224 AC22CFE0 */  sw        $v0, %lo(D_8010CFE0)($at)
-/* 846D8 800EB228 3C018011 */  lui       $at, %hi(D_8010CFE4)
-/* 846DC 800EB22C AC24CFE4 */  sw        $a0, %lo(D_8010CFE4)($at)
-/* 846E0 800EB230 A0C00000 */  sb        $zero, ($a2)
-/* 846E4 800EB234 10600008 */  beqz      $v1, .L800EB258
-/* 846E8 800EB238 A0C00001 */   sb       $zero, 1($a2)
-/* 846EC 800EB23C 10800009 */  beqz      $a0, .L800EB264
-/* 846F0 800EB240 24020004 */   addiu    $v0, $zero, 4
-/* 846F4 800EB244 24020002 */  addiu     $v0, $zero, 2
-/* 846F8 800EB248 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 846FC 800EB24C AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-.L800EB250:
-/* 84700 800EB250 03E00008 */  jr        $ra
-/* 84704 800EB254 00000000 */   nop
-.L800EB258:
-/* 84708 800EB258 14800006 */  bnez      $a0, .L800EB274
-/* 8470C 800EB25C 24020006 */   addiu    $v0, $zero, 6
-/* 84710 800EB260 24020004 */  addiu     $v0, $zero, 4
-.L800EB264:
-/* 84714 800EB264 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 84718 800EB268 AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 8471C 800EB26C 03E00008 */  jr        $ra
-/* 84720 800EB270 00000000 */   nop
-.L800EB274:
-/* 84724 800EB274 C4A00028 */  lwc1      $f0, 0x28($a1)
-/* 84728 800EB278 C4A2002C */  lwc1      $f2, 0x2c($a1)
-/* 8472C 800EB27C C4A40030 */  lwc1      $f4, 0x30($a1)
-/* 84730 800EB280 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 84734 800EB284 AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 84738 800EB288 3C018010 */  lui       $at, %hi(D_800F833C)
-/* 8473C 800EB28C E420833C */  swc1      $f0, %lo(D_800F833C)($at)
-/* 84740 800EB290 3C018010 */  lui       $at, %hi(D_800F8340)
-/* 84744 800EB294 E4228340 */  swc1      $f2, %lo(D_800F8340)($at)
-/* 84748 800EB298 3C018010 */  lui       $at, %hi(D_800F8344)
-/* 8474C 800EB29C 03E00008 */  jr        $ra
-/* 84750 800EB2A0 E4248344 */   swc1     $f4, %lo(D_800F8344)($at)
diff --git a/ver/us/asm/nonmatchings/world/partners/func_800EB2A4.s b/ver/us/asm/nonmatchings/world/partners/func_800EB2A4.s
deleted file mode 100644
index 0180591164..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/func_800EB2A4.s
+++ /dev/null
@@ -1,36 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_800EB2A4
-/* 84754 800EB2A4 3C038011 */  lui       $v1, %hi(D_8010CFD8)
-/* 84758 800EB2A8 8C63CFD8 */  lw        $v1, %lo(D_8010CFD8)($v1)
-/* 8475C 800EB2AC 1064000C */  beq       $v1, $a0, .L800EB2E0
-/* 84760 800EB2B0 24020001 */   addiu    $v0, $zero, 1
-/* 84764 800EB2B4 3C018011 */  lui       $at, %hi(D_8010CFE0)
-/* 84768 800EB2B8 AC22CFE0 */  sw        $v0, %lo(D_8010CFE0)($at)
-/* 8476C 800EB2BC 3C018011 */  lui       $at, %hi(D_8010CFE4)
-/* 84770 800EB2C0 AC24CFE4 */  sw        $a0, %lo(D_8010CFE4)($at)
-/* 84774 800EB2C4 10600008 */  beqz      $v1, .L800EB2E8
-/* 84778 800EB2C8 00000000 */   nop
-/* 8477C 800EB2CC 10800009 */  beqz      $a0, .L800EB2F4
-/* 84780 800EB2D0 24020005 */   addiu    $v0, $zero, 5
-/* 84784 800EB2D4 24020003 */  addiu     $v0, $zero, 3
-/* 84788 800EB2D8 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 8478C 800EB2DC AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-.L800EB2E0:
-/* 84790 800EB2E0 03E00008 */  jr        $ra
-/* 84794 800EB2E4 00000000 */   nop
-.L800EB2E8:
-/* 84798 800EB2E8 14800006 */  bnez      $a0, .L800EB304
-/* 8479C 800EB2EC 24020007 */   addiu    $v0, $zero, 7
-/* 847A0 800EB2F0 24020005 */  addiu     $v0, $zero, 5
-.L800EB2F4:
-/* 847A4 800EB2F4 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 847A8 800EB2F8 AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 847AC 800EB2FC 03E00008 */  jr        $ra
-/* 847B0 800EB300 00000000 */   nop
-.L800EB304:
-/* 847B4 800EB304 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 847B8 800EB308 AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 847BC 800EB30C 03E00008 */  jr        $ra
-/* 847C0 800EB310 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/world/partners/func_800EECE8.s b/ver/us/asm/nonmatchings/world/partners/func_800EECE8.s
index 198f005dbb..ab261d2bce 100644
--- a/ver/us/asm/nonmatchings/world/partners/func_800EECE8.s
+++ b/ver/us/asm/nonmatchings/world/partners/func_800EECE8.s
@@ -72,8 +72,8 @@ glabel func_800EECE8
 /* 88294 800EEDE4 00000000 */   nop
 /* 88298 800EEDE8 E600000C */  swc1      $f0, 0xc($s0)
 /* 8829C 800EEDEC C6200028 */  lwc1      $f0, 0x28($s1)
-/* 882A0 800EEDF0 3C128011 */  lui       $s2, %hi(D_8010CFEC)
-/* 882A4 800EEDF4 2652CFEC */  addiu     $s2, $s2, %lo(D_8010CFEC)
+/* 882A0 800EEDF0 3C128011 */  lui       $s2, %hi(wPartner)
+/* 882A4 800EEDF4 2652CFEC */  addiu     $s2, $s2, %lo(wPartner)
 /* 882A8 800EEDF8 E6000060 */  swc1      $f0, 0x60($s0)
 /* 882AC 800EEDFC C620002C */  lwc1      $f0, 0x2c($s1)
 /* 882B0 800EEE00 8E420000 */  lw        $v0, ($s2)
@@ -353,8 +353,8 @@ glabel func_800EECE8
 /* 886D4 800EF224 3C013F80 */  lui       $at, 0x3f80
 /* 886D8 800EF228 44810000 */  mtc1      $at, $f0
 /* 886DC 800EF22C C608003C */  lwc1      $f8, 0x3c($s0)
-/* 886E0 800EF230 3C128011 */  lui       $s2, %hi(D_8010CFEC)
-/* 886E4 800EF234 2652CFEC */  addiu     $s2, $s2, %lo(D_8010CFEC)
+/* 886E0 800EF230 3C128011 */  lui       $s2, %hi(wPartner)
+/* 886E4 800EF234 2652CFEC */  addiu     $s2, $s2, %lo(wPartner)
 /* 886E8 800EF238 AE00001C */  sw        $zero, 0x1c($s0)
 /* 886EC 800EF23C E6060060 */  swc1      $f6, 0x60($s0)
 /* 886F0 800EF240 E6020068 */  swc1      $f2, 0x68($s0)
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_can_use_ability.s b/ver/us/asm/nonmatchings/world/partners/partner_can_use_ability.s
deleted file mode 100644
index 42bd2f31ff..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_can_use_ability.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_can_use_ability
-/* 848DC 800EB42C 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 848E0 800EB430 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 848E4 800EB434 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 848E8 800EB438 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 848EC 800EB43C 8C42002C */  lw        $v0, 0x2c($v0)
-/* 848F0 800EB440 50400009 */  beql      $v0, $zero, .L800EB468
-/* 848F4 800EB444 0000102D */   daddu    $v0, $zero, $zero
-/* 848F8 800EB448 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 848FC 800EB44C 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
-/* 84900 800EB450 0040F809 */  jalr      $v0
-/* 84904 800EB454 00000000 */   nop
-/* 84908 800EB458 0040182D */  daddu     $v1, $v0, $zero
-/* 8490C 800EB45C 10600002 */  beqz      $v1, .L800EB468
-/* 84910 800EB460 24020001 */   addiu    $v0, $zero, 1
-/* 84914 800EB464 0000102D */  daddu     $v0, $zero, $zero
-.L800EB468:
-/* 84918 800EB468 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8491C 800EB46C 03E00008 */  jr        $ra
-/* 84920 800EB470 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_handle_after_battle.s b/ver/us/asm/nonmatchings/world/partners/partner_handle_after_battle.s
deleted file mode 100644
index 955e67c4e9..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_handle_after_battle.s
+++ /dev/null
@@ -1,73 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_handle_after_battle
-/* 84B74 800EB6C4 3C028011 */  lui       $v0, %hi(D_8010CFD8)
-/* 84B78 800EB6C8 8C42CFD8 */  lw        $v0, %lo(D_8010CFD8)($v0)
-/* 84B7C 800EB6CC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 84B80 800EB6D0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 84B84 800EB6D4 3C118011 */  lui       $s1, %hi(D_8010EBB0)
-/* 84B88 800EB6D8 2631EBB0 */  addiu     $s1, $s1, %lo(D_8010EBB0)
-/* 84B8C 800EB6DC AFBF0018 */  sw        $ra, 0x18($sp)
-/* 84B90 800EB6E0 10400035 */  beqz      $v0, .L800EB7B8
-/* 84B94 800EB6E4 AFB00010 */   sw       $s0, 0x10($sp)
-/* 84B98 800EB6E8 3C108011 */  lui       $s0, %hi(D_8010CFDC)
-/* 84B9C 800EB6EC 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
-/* 84BA0 800EB6F0 0C0B1059 */  jal       does_script_exist
-/* 84BA4 800EB6F4 8E040000 */   lw       $a0, ($s0)
-/* 84BA8 800EB6F8 10400003 */  beqz      $v0, .L800EB708
-/* 84BAC 800EB6FC 00000000 */   nop
-/* 84BB0 800EB700 0C0B102B */  jal       kill_script_by_ID
-/* 84BB4 800EB704 8E040000 */   lw       $a0, ($s0)
-.L800EB708:
-/* 84BB8 800EB708 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84BBC 800EB70C 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 84BC0 800EB710 24050014 */  addiu     $a1, $zero, 0x14
-/* 84BC4 800EB714 8C440018 */  lw        $a0, 0x18($v0)
-/* 84BC8 800EB718 0C0B0CF8 */  jal       start_script
-/* 84BCC 800EB71C 24060020 */   addiu    $a2, $zero, 0x20
-/* 84BD0 800EB720 3C038011 */  lui       $v1, %hi(D_8010C930)
-/* 84BD4 800EB724 8C63C930 */  lw        $v1, %lo(D_8010C930)($v1)
-/* 84BD8 800EB728 8C440144 */  lw        $a0, 0x144($v0)
-/* 84BDC 800EB72C 3C018011 */  lui       $at, %hi(D_8010CFD4)
-/* 84BE0 800EB730 AC22CFD4 */  sw        $v0, %lo(D_8010CFD4)($at)
-/* 84BE4 800EB734 AC43014C */  sw        $v1, 0x14c($v0)
-/* 84BE8 800EB738 2403000A */  addiu     $v1, $zero, 0xa
-/* 84BEC 800EB73C AE040000 */  sw        $a0, ($s0)
-/* 84BF0 800EB740 A0430004 */  sb        $v1, 4($v0)
-/* 84BF4 800EB744 24020001 */  addiu     $v0, $zero, 1
-/* 84BF8 800EB748 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 84BFC 800EB74C AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 84C00 800EB750 3C028011 */  lui       $v0, %hi(gPlayerData)
-/* 84C04 800EB754 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
-/* 84C08 800EB758 80420012 */  lb        $v0, 0x12($v0)
-/* 84C0C 800EB75C 24030006 */  addiu     $v1, $zero, 6
-/* 84C10 800EB760 1043000C */  beq       $v0, $v1, .L800EB794
-/* 84C14 800EB764 00000000 */   nop
-/* 84C18 800EB768 82220003 */  lb        $v0, 3($s1)
-/* 84C1C 800EB76C 14430009 */  bne       $v0, $v1, .L800EB794
-/* 84C20 800EB770 2403FFFE */   addiu    $v1, $zero, -2
-/* 84C24 800EB774 3C04800F */  lui       $a0, %hi(gPlayerStatusPtr)
-/* 84C28 800EB778 8C847B30 */  lw        $a0, %lo(gPlayerStatusPtr)($a0)
-/* 84C2C 800EB77C 8C820004 */  lw        $v0, 4($a0)
-/* 84C30 800EB780 00431024 */  and       $v0, $v0, $v1
-/* 84C34 800EB784 2403FFFD */  addiu     $v1, $zero, -3
-/* 84C38 800EB788 00431024 */  and       $v0, $v0, $v1
-/* 84C3C 800EB78C AC820004 */  sw        $v0, 4($a0)
-/* 84C40 800EB790 A2200003 */  sb        $zero, 3($s1)
-.L800EB794:
-/* 84C44 800EB794 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84C48 800EB798 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 84C4C 800EB79C 8C420038 */  lw        $v0, 0x38($v0)
-/* 84C50 800EB7A0 10400005 */  beqz      $v0, .L800EB7B8
-/* 84C54 800EB7A4 00000000 */   nop
-/* 84C58 800EB7A8 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 84C5C 800EB7AC 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
-/* 84C60 800EB7B0 0040F809 */  jalr      $v0
-/* 84C64 800EB7B4 00000000 */   nop
-.L800EB7B8:
-/* 84C68 800EB7B8 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 84C6C 800EB7BC 8FB10014 */  lw        $s1, 0x14($sp)
-/* 84C70 800EB7C0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 84C74 800EB7C4 03E00008 */  jr        $ra
-/* 84C78 800EB7C8 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_handle_before_battle.s b/ver/us/asm/nonmatchings/world/partners/partner_handle_before_battle.s
deleted file mode 100644
index da9c05296b..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_handle_before_battle.s
+++ /dev/null
@@ -1,33 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_handle_before_battle
-/* 84B08 800EB658 3C028011 */  lui       $v0, %hi(D_8010CFD8)
-/* 84B0C 800EB65C 8C42CFD8 */  lw        $v0, %lo(D_8010CFD8)($v0)
-/* 84B10 800EB660 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 84B14 800EB664 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 84B18 800EB668 10400012 */  beqz      $v0, .L800EB6B4
-/* 84B1C 800EB66C AFB00010 */   sw       $s0, 0x10($sp)
-/* 84B20 800EB670 3C108011 */  lui       $s0, %hi(D_8010CFDC)
-/* 84B24 800EB674 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
-/* 84B28 800EB678 0C0B1059 */  jal       does_script_exist
-/* 84B2C 800EB67C 8E040000 */   lw       $a0, ($s0)
-/* 84B30 800EB680 10400003 */  beqz      $v0, .L800EB690
-/* 84B34 800EB684 00000000 */   nop
-/* 84B38 800EB688 0C0B102B */  jal       kill_script_by_ID
-/* 84B3C 800EB68C 8E040000 */   lw       $a0, ($s0)
-.L800EB690:
-/* 84B40 800EB690 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84B44 800EB694 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 84B48 800EB698 8C420034 */  lw        $v0, 0x34($v0)
-/* 84B4C 800EB69C 10400005 */  beqz      $v0, .L800EB6B4
-/* 84B50 800EB6A0 00000000 */   nop
-/* 84B54 800EB6A4 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 84B58 800EB6A8 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
-/* 84B5C 800EB6AC 0040F809 */  jalr      $v0
-/* 84B60 800EB6B0 00000000 */   nop
-.L800EB6B4:
-/* 84B64 800EB6B4 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 84B68 800EB6B8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 84B6C 800EB6BC 03E00008 */  jr        $ra
-/* 84B70 800EB6C0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_initialize_data.s b/ver/us/asm/nonmatchings/world/partners/partner_initialize_data.s
deleted file mode 100644
index c7a2880fed..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_initialize_data.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_initialize_data
-/* 84A30 800EB580 3C028011 */  lui       $v0, %hi(D_8010EBB0)
-/* 84A34 800EB584 2442EBB0 */  addiu     $v0, $v0, %lo(D_8010EBB0)
-/* 84A38 800EB588 3C018011 */  lui       $at, %hi(D_8010CFD8)
-/* 84A3C 800EB58C AC20CFD8 */  sw        $zero, %lo(D_8010CFD8)($at)
-/* 84A40 800EB590 3C018011 */  lui       $at, %hi(D_8010CFE0)
-/* 84A44 800EB594 AC20CFE0 */  sw        $zero, %lo(D_8010CFE0)($at)
-/* 84A48 800EB598 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 84A4C 800EB59C AC20CFE8 */  sw        $zero, %lo(D_8010CFE8)($at)
-/* 84A50 800EB5A0 3C018011 */  lui       $at, %hi(D_8010CFC4)
-/* 84A54 800EB5A4 AC20CFC4 */  sw        $zero, %lo(D_8010CFC4)($at)
-/* 84A58 800EB5A8 A0400003 */  sb        $zero, 3($v0)
-/* 84A5C 800EB5AC A0400014 */  sb        $zero, 0x14($v0)
-/* 84A60 800EB5B0 A0400001 */  sb        $zero, 1($v0)
-/* 84A64 800EB5B4 A0400000 */  sb        $zero, ($v0)
-/* 84A68 800EB5B8 AC400358 */  sw        $zero, 0x358($v0)
-/* 84A6C 800EB5BC A0400002 */  sb        $zero, 2($v0)
-/* 84A70 800EB5C0 3C018011 */  lui       $at, %hi(D_8010CFEC)
-/* 84A74 800EB5C4 AC20CFEC */  sw        $zero, %lo(D_8010CFEC)($at)
-/* 84A78 800EB5C8 3C018010 */  lui       $at, %hi(D_800F833C)
-/* 84A7C 800EB5CC AC20833C */  sw        $zero, %lo(D_800F833C)($at)
-/* 84A80 800EB5D0 3C018010 */  lui       $at, %hi(D_800F8340)
-/* 84A84 800EB5D4 AC208340 */  sw        $zero, %lo(D_800F8340)($at)
-/* 84A88 800EB5D8 3C018010 */  lui       $at, %hi(D_800F8344)
-/* 84A8C 800EB5DC 03E00008 */  jr        $ra
-/* 84A90 800EB5E0 AC208344 */   sw       $zero, %lo(D_800F8344)($at)
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_kill_ability_script.s b/ver/us/asm/nonmatchings/world/partners/partner_kill_ability_script.s
deleted file mode 100644
index 8eb14a29d5..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_kill_ability_script.s
+++ /dev/null
@@ -1,24 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_kill_ability_script
-/* 84C7C 800EB7CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 84C80 800EB7D0 AFB00010 */  sw        $s0, 0x10($sp)
-/* 84C84 800EB7D4 3C108011 */  lui       $s0, %hi(D_8010CFDC)
-/* 84C88 800EB7D8 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
-/* 84C8C 800EB7DC AFBF0014 */  sw        $ra, 0x14($sp)
-/* 84C90 800EB7E0 8E040000 */  lw        $a0, ($s0)
-/* 84C94 800EB7E4 2402000A */  addiu     $v0, $zero, 0xa
-/* 84C98 800EB7E8 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 84C9C 800EB7EC AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 84CA0 800EB7F0 0C0B1059 */  jal       does_script_exist
-/* 84CA4 800EB7F4 00000000 */   nop
-/* 84CA8 800EB7F8 10400003 */  beqz      $v0, .L800EB808
-/* 84CAC 800EB7FC 00000000 */   nop
-/* 84CB0 800EB800 0C0B102B */  jal       kill_script_by_ID
-/* 84CB4 800EB804 8E040000 */   lw       $a0, ($s0)
-.L800EB808:
-/* 84CB8 800EB808 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 84CBC 800EB80C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 84CC0 800EB810 03E00008 */  jr        $ra
-/* 84CC4 800EB814 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_player_can_pause.s b/ver/us/asm/nonmatchings/world/partners/partner_player_can_pause.s
index 364d10016b..9a3618048a 100644
--- a/ver/us/asm/nonmatchings/world/partners/partner_player_can_pause.s
+++ b/ver/us/asm/nonmatchings/world/partners/partner_player_can_pause.s
@@ -2,16 +2,16 @@
 .set noreorder # don't insert nops after branches
 
 glabel partner_player_can_pause
-/* 84890 800EB3E0 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84894 800EB3E4 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
+/* 84890 800EB3E0 3C028011 */  lui       $v0, %hi(wPartner)
+/* 84894 800EB3E4 8C42CFEC */  lw        $v0, %lo(wPartner)($v0)
 /* 84898 800EB3E8 27BDFFE8 */  addiu     $sp, $sp, -0x18
 /* 8489C 800EB3EC 1040000B */  beqz      $v0, .L800EB41C
 /* 848A0 800EB3F0 AFBF0010 */   sw       $ra, 0x10($sp)
 /* 848A4 800EB3F4 8C420030 */  lw        $v0, 0x30($v0)
 /* 848A8 800EB3F8 50400009 */  beql      $v0, $zero, .L800EB420
 /* 848AC 800EB3FC 24020001 */   addiu    $v0, $zero, 1
-/* 848B0 800EB400 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 848B4 800EB404 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
+/* 848B0 800EB400 3C048011 */  lui       $a0, %hi(wPartnerNpc)
+/* 848B4 800EB404 8C84C930 */  lw        $a0, %lo(wPartnerNpc)($a0)
 /* 848B8 800EB408 0040F809 */  jalr      $v0
 /* 848BC 800EB40C 00000000 */   nop
 /* 848C0 800EB410 0040182D */  daddu     $v1, $v0, $zero
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_reset_data.s b/ver/us/asm/nonmatchings/world/partners/partner_reset_data.s
index 97c5fcc2a9..8ac5d2709c 100644
--- a/ver/us/asm/nonmatchings/world/partners/partner_reset_data.s
+++ b/ver/us/asm/nonmatchings/world/partners/partner_reset_data.s
@@ -43,8 +43,8 @@ glabel partner_reset_data
 /* 849B8 800EB508 C602002C */  lwc1      $f2, 0x2c($s0)
 /* 849BC 800EB50C C6040030 */  lwc1      $f4, 0x30($s0)
 /* 849C0 800EB510 8CA20000 */  lw        $v0, ($a1)
-/* 849C4 800EB514 3C018011 */  lui       $at, %hi(D_8010CFEC)
-/* 849C8 800EB518 AC20CFEC */  sw        $zero, %lo(D_8010CFEC)($at)
+/* 849C4 800EB514 3C018011 */  lui       $at, %hi(wPartner)
+/* 849C8 800EB518 AC20CFEC */  sw        $zero, %lo(wPartner)($at)
 /* 849CC 800EB51C 3C018010 */  lui       $at, %hi(D_800F833C)
 /* 849D0 800EB520 E420833C */  swc1      $f0, %lo(D_800F833C)($at)
 /* 849D4 800EB524 3C018010 */  lui       $at, %hi(D_800F8340)
@@ -57,8 +57,8 @@ glabel partner_reset_data
 .L800EB540:
 /* 849F0 800EB540 0C03A974 */  jal       load_partner_npc
 /* 849F4 800EB544 00000000 */   nop
-/* 849F8 800EB548 3C028011 */  lui       $v0, %hi(D_8010C930)
-/* 849FC 800EB54C 8C42C930 */  lw        $v0, %lo(D_8010C930)($v0)
+/* 849F8 800EB548 3C028011 */  lui       $v0, %hi(wPartnerNpc)
+/* 849FC 800EB54C 8C42C930 */  lw        $v0, %lo(wPartnerNpc)($v0)
 /* 84A00 800EB550 3C013F80 */  lui       $at, 0x3f80
 /* 84A04 800EB554 44810000 */  mtc1      $at, $f0
 /* 84A08 800EB558 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_resume_ability_script.s b/ver/us/asm/nonmatchings/world/partners/partner_resume_ability_script.s
deleted file mode 100644
index 8617cf60b2..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_resume_ability_script.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_resume_ability_script
-/* 84D10 800EB860 3C028011 */  lui       $v0, %hi(D_8010CFD8)
-/* 84D14 800EB864 8C42CFD8 */  lw        $v0, %lo(D_8010CFD8)($v0)
-/* 84D18 800EB868 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 84D1C 800EB86C AFBF0014 */  sw        $ra, 0x14($sp)
-/* 84D20 800EB870 10400009 */  beqz      $v0, .L800EB898
-/* 84D24 800EB874 AFB00010 */   sw       $s0, 0x10($sp)
-/* 84D28 800EB878 3C108011 */  lui       $s0, %hi(D_8010CFDC)
-/* 84D2C 800EB87C 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
-/* 84D30 800EB880 0C0B1059 */  jal       does_script_exist
-/* 84D34 800EB884 8E040000 */   lw       $a0, ($s0)
-/* 84D38 800EB888 10400003 */  beqz      $v0, .L800EB898
-/* 84D3C 800EB88C 00000000 */   nop
-/* 84D40 800EB890 0C0B1123 */  jal       resume_all_script
-/* 84D44 800EB894 8E040000 */   lw       $a0, ($s0)
-.L800EB898:
-/* 84D48 800EB898 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 84D4C 800EB89C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 84D50 800EB8A0 03E00008 */  jr        $ra
-/* 84D54 800EB8A4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_suspend_ability_script.s b/ver/us/asm/nonmatchings/world/partners/partner_suspend_ability_script.s
deleted file mode 100644
index 2c34b6170c..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_suspend_ability_script.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_suspend_ability_script
-/* 84CC8 800EB818 3C028011 */  lui       $v0, %hi(D_8010CFD8)
-/* 84CCC 800EB81C 8C42CFD8 */  lw        $v0, %lo(D_8010CFD8)($v0)
-/* 84CD0 800EB820 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 84CD4 800EB824 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 84CD8 800EB828 10400009 */  beqz      $v0, .L800EB850
-/* 84CDC 800EB82C AFB00010 */   sw       $s0, 0x10($sp)
-/* 84CE0 800EB830 3C108011 */  lui       $s0, %hi(D_8010CFDC)
-/* 84CE4 800EB834 2610CFDC */  addiu     $s0, $s0, %lo(D_8010CFDC)
-/* 84CE8 800EB838 0C0B1059 */  jal       does_script_exist
-/* 84CEC 800EB83C 8E040000 */   lw       $a0, ($s0)
-/* 84CF0 800EB840 10400003 */  beqz      $v0, .L800EB850
-/* 84CF4 800EB844 00000000 */   nop
-/* 84CF8 800EB848 0C0B1108 */  jal       suspend_all_script
-/* 84CFC 800EB84C 8E040000 */   lw       $a0, ($s0)
-.L800EB850:
-/* 84D00 800EB850 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 84D04 800EB854 8FB00010 */  lw        $s0, 0x10($sp)
-/* 84D08 800EB858 03E00008 */  jr        $ra
-/* 84D0C 800EB85C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_test_enemy_collision.s b/ver/us/asm/nonmatchings/world/partners/partner_test_enemy_collision.s
deleted file mode 100644
index e811f8848c..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_test_enemy_collision.s
+++ /dev/null
@@ -1,27 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_test_enemy_collision
-/* 84A94 800EB5E4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 84A98 800EB5E8 3C028011 */  lui       $v0, %hi(D_8010CFD8)
-/* 84A9C 800EB5EC 8C42CFD8 */  lw        $v0, %lo(D_8010CFD8)($v0)
-/* 84AA0 800EB5F0 0080282D */  daddu     $a1, $a0, $zero
-/* 84AA4 800EB5F4 1040000C */  beqz      $v0, .L800EB628
-/* 84AA8 800EB5F8 AFBF0010 */   sw       $ra, 0x10($sp)
-/* 84AAC 800EB5FC 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 84AB0 800EB600 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 84AB4 800EB604 8C420028 */  lw        $v0, 0x28($v0)
-/* 84AB8 800EB608 50400008 */  beql      $v0, $zero, .L800EB62C
-/* 84ABC 800EB60C 0000102D */   daddu    $v0, $zero, $zero
-/* 84AC0 800EB610 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 84AC4 800EB614 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
-/* 84AC8 800EB618 0040F809 */  jalr      $v0
-/* 84ACC 800EB61C 00000000 */   nop
-/* 84AD0 800EB620 0803AD8B */  j         .L800EB62C
-/* 84AD4 800EB624 00000000 */   nop
-.L800EB628:
-/* 84AD8 800EB628 0000102D */  daddu     $v0, $zero, $zero
-.L800EB62C:
-/* 84ADC 800EB62C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 84AE0 800EB630 03E00008 */  jr        $ra
-/* 84AE4 800EB634 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/partners/partner_use_ability.s b/ver/us/asm/nonmatchings/world/partners/partner_use_ability.s
deleted file mode 100644
index f89c99c355..0000000000
--- a/ver/us/asm/nonmatchings/world/partners/partner_use_ability.s
+++ /dev/null
@@ -1,59 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel partner_use_ability
-/* 847C4 800EB314 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 847C8 800EB318 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 847CC 800EB31C 0C011052 */  jal       is_starting_conversation
-/* 847D0 800EB320 00000000 */   nop
-/* 847D4 800EB324 1440002B */  bnez      $v0, .L800EB3D4
-/* 847D8 800EB328 0000102D */   daddu    $v0, $zero, $zero
-/* 847DC 800EB32C 3C028011 */  lui       $v0, %hi(D_8010CFEC)
-/* 847E0 800EB330 8C42CFEC */  lw        $v0, %lo(D_8010CFEC)($v0)
-/* 847E4 800EB334 50400027 */  beql      $v0, $zero, .L800EB3D4
-/* 847E8 800EB338 0000102D */   daddu    $v0, $zero, $zero
-/* 847EC 800EB33C 8C42002C */  lw        $v0, 0x2c($v0)
-/* 847F0 800EB340 10400007 */  beqz      $v0, .L800EB360
-/* 847F4 800EB344 00000000 */   nop
-/* 847F8 800EB348 3C048011 */  lui       $a0, %hi(D_8010C930)
-/* 847FC 800EB34C 8C84C930 */  lw        $a0, %lo(D_8010C930)($a0)
-/* 84800 800EB350 0040F809 */  jalr      $v0
-/* 84804 800EB354 00000000 */   nop
-/* 84808 800EB358 1040001E */  beqz      $v0, .L800EB3D4
-/* 8480C 800EB35C 0000102D */   daddu    $v0, $zero, $zero
-.L800EB360:
-/* 84810 800EB360 3C028007 */  lui       $v0, %hi(gGameStatusPtr)
-/* 84814 800EB364 8C42419C */  lw        $v0, %lo(gGameStatusPtr)($v0)
-/* 84818 800EB368 80420081 */  lb        $v0, 0x81($v0)
-/* 8481C 800EB36C 1040000B */  beqz      $v0, .L800EB39C
-/* 84820 800EB370 00000000 */   nop
-/* 84824 800EB374 3C028011 */  lui       $v0, %hi(D_8010EBB0)
-/* 84828 800EB378 2442EBB0 */  addiu     $v0, $v0, %lo(D_8010EBB0)
-/* 8482C 800EB37C 8C420008 */  lw        $v0, 8($v0)
-/* 84830 800EB380 30424000 */  andi      $v0, $v0, 0x4000
-/* 84834 800EB384 10400005 */  beqz      $v0, .L800EB39C
-/* 84838 800EB388 00000000 */   nop
-/* 8483C 800EB38C 0C05272D */  jal       play_sound
-/* 84840 800EB390 2404021D */   addiu    $a0, $zero, 0x21d
-/* 84844 800EB394 0803ACF5 */  j         .L800EB3D4
-/* 84848 800EB398 0000102D */   daddu    $v0, $zero, $zero
-.L800EB39C:
-/* 8484C 800EB39C 3C028011 */  lui       $v0, %hi(D_8010CFD8)
-/* 84850 800EB3A0 8C42CFD8 */  lw        $v0, %lo(D_8010CFD8)($v0)
-/* 84854 800EB3A4 1040000A */  beqz      $v0, .L800EB3D0
-/* 84858 800EB3A8 24020001 */   addiu    $v0, $zero, 1
-/* 8485C 800EB3AC 3C018011 */  lui       $at, %hi(D_8010CFE0)
-/* 84860 800EB3B0 AC22CFE0 */  sw        $v0, %lo(D_8010CFE0)($at)
-/* 84864 800EB3B4 24020008 */  addiu     $v0, $zero, 8
-/* 84868 800EB3B8 3C018011 */  lui       $at, %hi(D_8010CFE8)
-/* 8486C 800EB3BC AC22CFE8 */  sw        $v0, %lo(D_8010CFE8)($at)
-/* 84870 800EB3C0 0C03A9B3 */  jal       _use_partner_ability
-/* 84874 800EB3C4 00000000 */   nop
-/* 84878 800EB3C8 0803ACF5 */  j         .L800EB3D4
-/* 8487C 800EB3CC 24020001 */   addiu    $v0, $zero, 1
-.L800EB3D0:
-/* 84880 800EB3D0 0000102D */  daddu     $v0, $zero, $zero
-.L800EB3D4:
-/* 84884 800EB3D4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 84888 800EB3D8 03E00008 */  jr        $ra
-/* 8488C 800EB3DC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/world/load_map_by_IDs.s b/ver/us/asm/nonmatchings/world/world/load_map_by_IDs.s
index ebae6a40f0..5dcaa5e482 100644
--- a/ver/us/asm/nonmatchings/world/world/load_map_by_IDs.s
+++ b/ver/us/asm/nonmatchings/world/world/load_map_by_IDs.s
@@ -1,6 +1,19 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
+.section .rodata
+
+glabel D_80098A10
+.word 0x25735F73, 0x68617065, 0x00000000
+
+glabel D_80098A1C
+.word 0x25735F68, 0x69740000
+
+glabel D_80098A24
+.word 0x25735F74, 0x65780000
+
+.section .text
+
 glabel load_map_by_IDs
 /* 35AF4 8005A6F4 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 35AF8 8005A6F8 AFB00038 */  sw        $s0, 0x38($sp)
diff --git a/ver/us/asm/os/code_45df0_len_970.s b/ver/us/asm/os/exceptasm.s
similarity index 99%
rename from ver/us/asm/os/code_45df0_len_970.s
rename to ver/us/asm/os/exceptasm.s
index 5405f31560..80b77ab67d 100644
--- a/ver/us/asm/os/code_45df0_len_970.s
+++ b/ver/us/asm/os/exceptasm.s
@@ -5,6 +5,14 @@
 .set noreorder # don't insert nops after branches
 .set gp=64     # allow use of 64-bit general purpose registers
 
+.section .rodata
+
+glabel jtbl_80099D80
+.word 0x141818, 0x1C1C1C1C, 0x20202020, 0x20202020, 0x40808, 0xC0C0C0C, 0x10101010, 0x10101010
+
+glabel jtbl_80099DA0
+.word L8006AF00_46300, L8006AEC4_462C4, L8006AEA0_462A0, L8006ACC8_460C8, L8006AC80_46080, L8006AE3C_4623C, L8006AC44_46044, L8006AC50_46050, L8006AC5C_4605C, 0, 0, 0
+
 .section .text, "ax"
 
 glabel func_8006A9F0
diff --git a/ver/us/asm/os/osSetIntMask.s b/ver/us/asm/os/osSetIntMask.s
index df82054d1c..b4b57c2c70 100644
--- a/ver/us/asm/os/osSetIntMask.s
+++ b/ver/us/asm/os/osSetIntMask.s
@@ -5,6 +5,11 @@
 .set noreorder # don't insert nops after branches
 .set gp=64     # allow use of 64-bit general purpose registers
 
+.section .rodata
+
+glabel D_80099AA0
+.short 0x0555, 0x0556, 0x0559, 0x055A, 0x0565, 0x0566, 0x0569, 0x056A, 0x0595, 0x0596, 0x0599, 0x059A, 0x05A5, 0x05A6, 0x05A9, 0x05AA, 0x0655, 0x0656, 0x0659, 0x065A, 0x0665, 0x0666, 0x0669, 0x066A, 0x0695, 0x0696, 0x0699, 0x069A, 0x06A5, 0x06A6, 0x06A9, 0x06AA, 0x0955, 0x0956, 0x0959, 0x095A, 0x0965, 0x0966, 0x0969, 0x096A, 0x0995, 0x0996, 0x0999, 0x099A, 0x09A5, 0x09A6, 0x09A9, 0x09AA, 0x0A55, 0x0A56, 0x0A59, 0x0A5A, 0x0A65, 0x0A66, 0x0A69, 0x0A6A, 0x0A95, 0x0A96, 0x0A99, 0x0A9A, 0x0AA5, 0x0AA6, 0x0AA9, 0x0AAA
+
 .section .text, "ax"
 
 glabel osSetIntMask
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 213db52aac..db290bf9d8 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -27,7 +27,7 @@ segments:
   - type: code
     start: 0x1000
     vram: 0x80025C00
-    subalign: 8
+    subalign: 4
     subsections:
     - [0x1000, hasm, entry_point]
     - [0x1060, c, code_1060_len_310]
@@ -199,7 +199,7 @@ segments:
     - [0x457c0, c, os/code_457c0_len_270]
     - [0x45a30, c, os/code_45a30_len_20]
     - [0x45a50, c, os/code_45a50_len_3a0]
-    - [0x45df0, hasm, os/code_45df0_len_970]
+    - [0x45df0, hasm, os/exceptasm]
     - [0x46760, hasm, os/__osDisableInt]
     - [0x467D0, hasm, os/__osRestoreInt]
     - [0x467f0, c, os/code_467f0_len_90]
@@ -251,7 +251,19 @@ segments:
     - [0x73130, rodata, code_1060_len_310]
     - [0x73148, .rodata, code_1b40_len_20b0]
     - [0x73160, .rodata, code_43F0]
-    - [0x73200, rodata]
+    - [0x73200, .rodata, code_6e40_len_500]
+    - [0x73434, .rodata, code_7340_len_b00]
+    - [0x735E0, .rodata, code_8800]
+    - [0x73610, .rodata, code_B0E0]
+    - [0x73680, .rodata, code_d610_len_1330]
+    - [0x73690, .rodata, code_f270_len_1190]
+    - [0x736E8, .rodata, code_10400_len_d30]
+    - [0x73720, .rodata, code_111f0_len_860]
+    - [0x73738, .rodata, code_11a50_len_7a0]
+    - [0x73790, .rodata, code_121f0_len_1290]
+    - [0x73860, .rodata, code_13480_len_3f0]
+    - [0x73880, .rodata, code_13870_len_6980]
+    - [0x739F0, .rodata, code_1a1f0_len_5390]
     - [0x73AB0, .rodata, code_20ec0_len_5040]
     - [0x73B10, .rodata, code_23680]
     - [0x73CC0, .rodata, code_28910_len_5090]
@@ -260,10 +272,21 @@ segments:
     - [0x73D30, .rodata, code_33450]
     - [0x73D40, .rodata, code_341d0]
     - [0x73DA0, .rodata, world/world]
-    - [0x74EA0, rodata]
+    - [0x74EA0, .rodata, os/osSetIntMask]
+    - [0x74F20, .rodata, os/code_3c490_len_3c0]
+    - [0x74F40, .rodata, os/code_3c940_len_140]
+    - [0x74F50, .rodata, os/guLookAt]
+    - [0x74F70, .rodata, os/code_3dcc0_len_a60]
+    - [0x74FA0, .rodata, os/code_3e720_len_5f0]
+    - [0x74FB0, .rodata, os/code_3ef90_len_600]
+    - [0x74FF0, .rodata, os/code_3FEA0]
+    - [0x75170, .rodata, os/code_42470_len_310]
+    - [0x75180, .rodata, os/exceptasm]
+    - [0x751D0, .rodata, os/code_46c70_len_e00]
     - [0x75240, .rodata, battle/battle] # ram 80099E40
     # bss starts at 0x8009A5B0
-    - [0x75240, .bss, os/code_39cb0_len_100, 0x800] # we need at least this much bss space until this file
+    # 0x800 of bss until...
+    - [0x75240, .bss, os/code_39cb0_len_100, 0x0] # size unknown
   - type: code
     start: 0x759B0
     vram: 0x800DC500
@@ -283,7 +306,7 @@ segments:
     - [0x90FE0, .data, code_759b0_len_61b0]
     - [0x913B0, .data, world/actions]
     - [0x914E0, .data, world/partners]
-    - [0x917EC, data]
+    - [0x917F8, data]
     - [0x93CD0, ci4,     ui/hammer, 32, 32]
     - [0x93ED0, palette, ui/hammer]
     - [0x93EF0, palette, ui/hammer.disabled]
@@ -343,9 +366,9 @@ segments:
     start: 0xFEE30
     vram: 0x802DBD40
     subsections:
-    - [0xfee30, c, code_fee30_len_2d60]
+    - [0x0fee30, c, code_fee30_len_2d60]
     - [0x101b90, c, code_101b90_len_8f0]
-    - [0x102480, data, code_fee30_len_2d60]
+    - [0x102480, .data, code_fee30_len_2d60]
   - type: code
     start: 0x102610
     vram: 0x802E0D90
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index df8ac07814..5e8592a480 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -1649,7 +1649,7 @@ D_800F802C = 0x800F802C; // type:data rom:0x914DC
 D_800F8030 = 0x800F8030; // type:data rom:0x914E0
 D_800F8034 = 0x800F8034; // type:data rom:0x914E4
 D_800F803A = 0x800F803A; // type:data rom:0x914EA
-wPartners = 0x800F803C; // rom:0x914EC data
+wPartners = 0x800F803C; // rom:0x914EC type:data size:0x300
 D_80108A64 = 0x80108A64; // type:data rom:0xA1F14
 update_entities = 0x8010F6D0; // type:func rom:0xA5DD0
 update_shadows = 0x8010FA98; // type:func rom:0xA6198
@@ -15409,7 +15409,7 @@ D_8010C920 = 0x8010C920; // type:data
 D_8010C924 = 0x8010C924; // type:data
 D_8010C928 = 0x8010C928; // type:data
 D_8010C92C = 0x8010C92C; // type:data
-D_8010C930 = 0x8010C930; // type:data
+wPartnerNpc = 0x8010C930; // type:data
 D_8010C934 = 0x8010C934; // type:data
 D_8010C938 = 0x8010C938; // type:data
 D_8010C93C = 0x8010C93C; // type:data
@@ -15464,7 +15464,7 @@ D_8010CFDC = 0x8010CFDC; // type:data
 D_8010CFE0 = 0x8010CFE0; // type:data
 D_8010CFE4 = 0x8010CFE4; // type:data
 D_8010CFE8 = 0x8010CFE8; // type:data
-D_8010CFEC = 0x8010CFEC; // type:data
+wPartner = 0x8010CFEC; // type:data
 D_8010CFF0 = 0x8010CFF0; // type:data
 D_8010CFF4 = 0x8010CFF4; // type:data
 D_8010D000 = 0x8010D000; // type:data
@@ -15509,11 +15509,7 @@ D_8010D69C = 0x8010D69C; // type:data
 D_8010D6A0 = 0x8010D6A0; // type:data
 D_8010D6A4 = 0x8010D6A4; // type:data
 D_8010D6B0 = 0x8010D6B0; // type:data
-D_8010EBB0 = 0x8010EBB0; // type:data
-D_8010EBB1 = 0x8010EBB1; // type:data
-D_8010EBB3 = 0x8010EBB3; // type:data
-D_8010EBB4 = 0x8010EBB4; // type:data
-D_8010EF08 = 0x8010EF08; // type:data
+D_8010EBB0 = 0x8010EBB0; // type:data size:0x35C
 D_8010EF10 = 0x8010EF10; // type:data
 D_8010EF28 = 0x8010EF28; // type:data
 D_8010EF40 = 0x8010EF40; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index ade23f4568..a4a6b93f86 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -101,3 +101,4 @@ D_801081A8 = 0x801081A8;
 D_801081D0 = 0x801081D0;
 D_801081F8 = 0x801081F8;
 D_80108220 = 0x80108220;
+D_80097D30 = 0x80097D30;
diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt
index eb990966cb..d1a677f3b8 100644
--- a/ver/us/undefined_syms_auto.txt
+++ b/ver/us/undefined_syms_auto.txt
@@ -16,14 +16,6 @@ D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
 nuContRmbSearchTime = 0x80093CE0;
 nuContRmbCallBack = 0x80093D00;
-D_80098710 = 0x80098710;
-D_80098718 = 0x80098718;
-D_80098720 = 0x80098720;
-D_800988C0 = 0x800988C0;
-D_80098930 = 0x80098930;
-D_80098938 = 0x80098938;
-D_80098968 = 0x80098968;
-D_80098990 = 0x80098990;
 gPlayerStatusPtr = 0x800F7B30;
 D_800F7B40 = 0x800F7B40;
 D_800F7B44 = 0x800F7B44;
@@ -1934,21 +1926,6 @@ D_80078E5C = 0x80078E5C;
 D_80078E60 = 0x80078E60;
 gAreas = 0x800934F0;
 gBattleAreas = 0x80095A30;
-D_80097D60 = 0x80097D60;
-D_80097D68 = 0x80097D68;
-D_80097D70 = 0x80097D70;
-D_80097D78 = 0x80097D78;
-D_80097D80 = 0x80097D80;
-D_80097D88 = 0x80097D88;
-D_80097DC8 = 0x80097DC8;
-D_80097DD0 = 0x80097DD0;
-D_80097DD8 = 0x80097DD8;
-D_80097DE0 = 0x80097DE0;
-D_80097DE8 = 0x80097DE8;
-D_80097DF0 = 0x80097DF0;
-D_80098A10 = 0x80098A10;
-D_80098A1C = 0x80098A1C;
-D_80098A24 = 0x80098A24;
 D_80099E40 = 0x80099E40;
 D_80099F40 = 0x80099F40;
 D_8009A040 = 0x8009A040;
@@ -2280,11 +2257,14 @@ gBattleStatus = 0x800DC070;
 D_800F7C20 = 0x800F7C20;
 D_800F7C24 = 0x800F7C24;
 D_800F7C28 = 0x800F7C28;
+D_800F833C = 0x800F833C;
+D_800F8340 = 0x800F8340;
+D_800F8344 = 0x800F8344;
 D_8010C920 = 0x8010C920;
 D_8010C924 = 0x8010C924;
 D_8010C928 = 0x8010C928;
 D_8010C92C = 0x8010C92C;
-D_8010C930 = 0x8010C930;
+wPartnerNpc = 0x8010C930;
 D_8010C934 = 0x8010C934;
 D_8010C938 = 0x8010C938;
 D_8010C93C = 0x8010C93C;
@@ -2339,7 +2319,7 @@ D_8010CFDC = 0x8010CFDC;
 D_8010CFE0 = 0x8010CFE0;
 D_8010CFE4 = 0x8010CFE4;
 D_8010CFE8 = 0x8010CFE8;
-D_8010CFEC = 0x8010CFEC;
+wPartner = 0x8010CFEC;
 D_8010CFF0 = 0x8010CFF0;
 D_8010CFF4 = 0x8010CFF4;
 D_8010D000 = 0x8010D000;
@@ -2385,10 +2365,6 @@ D_8010D6A0 = 0x8010D6A0;
 D_8010D6A4 = 0x8010D6A4;
 D_8010D6B0 = 0x8010D6B0;
 D_8010EBB0 = 0x8010EBB0;
-D_8010EBB1 = 0x8010EBB1;
-D_8010EBB3 = 0x8010EBB3;
-D_8010EBB4 = 0x8010EBB4;
-D_8010EF08 = 0x8010EF08;
 D_8010EF10 = 0x8010EF10;
 D_8010EF28 = 0x8010EF28;
 D_8010EF40 = 0x8010EF40;
@@ -3647,7 +3623,6 @@ D_802BFF20 = 0x802BFF20;
 D_802BFF24 = 0x802BFF24;
 D_802BFF28 = 0x802BFF28;
 D_802C0000 = 0x802C0000;
-D_802D9D80 = 0x802D9D80;
 gMapFlags = 0x802DA480;
 gMapVars = 0x802DA484;
 gNumScripts = 0x802DA488;
@@ -4486,21 +4461,17 @@ D_F5000007 = 0xF5000007;
 D_F79DDD0F = 0xF79DDD0F;
 D_FA000028 = 0xFA000028;
 D_FD100008 = 0xFD100008;
-jtbl_80097D48 = 0x80097D48;
-jtbl_80097D90 = 0x80097D90;
-jtbl_800986B0 = 0x800986B0;
-jtbl_800986C8 = 0x800986C8;
-jtbl_800986E8 = 0x800986E8;
-jtbl_80098728 = 0x80098728;
-jtbl_800988D8 = 0x800988D8;
-jtbl_800988F0 = 0x800988F0;
-jtbl_80098908 = 0x80098908;
-jtbl_80098940 = 0x80098940;
-jtbl_80098970 = 0x80098970;
 jtbl_8009A578 = 0x8009A578;
 jtbl_8009A590 = 0x8009A590;
-jtbl_802EB160 = 0x802EB160;
-jtbl_802EB198 = 0x802EB198;
+D_802DF390 = 0x802DF390;
+D_802DF3E0 = 0x802DF3E0;
+D_802DF3D0 = 0x802DF3D0;
+D_802DF460 = 0x802DF460;
+D_802DF490 = 0x802DF490;
+D_802DF3F0 = 0x802DF3F0;
+D_802DF428 = 0x802DF428;
+D_802DF4C0 = 0x802DF4C0;
+D_802DF4C4 = 0x802DF4C4;
 jtbl_E000CD40 = 0xE000CD40;
 jtbl_E000CD58 = 0xE000CD58;
 jtbl_E0044F00 = 0xE0044F00;
@@ -4670,7 +4641,6 @@ jtbl_8022EB80_56DF60 = 0x8022EB80;
 jtbl_80231320_63CEC0 = 0x80231320;
 jtbl_80232A20_6847A0 = 0x80232A20;
 jtbl_80228450_6CBFE0 = 0x80228450;
-jtbl_80286500 = 0x80286500;
 jtbl_802559D0_8006E0 = 0x802559D0;
 jtbl_802626F0_822F70 = 0x802626F0;
 jtbl_802628A0_823120 = 0x802628A0;