diff --git a/include/common_structs.h b/include/common_structs.h
index 6976961445..52a9e571cd 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -136,7 +136,7 @@ typedef struct CamPosSettings {
     /* 0x04 */ f32 boomLength;
     /* 0x08 */ f32 boomPitch;
     /* 0x0C */ f32 viewPitch;
-    /* 0x10 */ Vec3f position;
+    /* 0x10 */ Vec3f pos;
 } CamPosSettings; // size = 0x1C
 
 typedef struct DmaTable {
@@ -378,7 +378,7 @@ typedef struct Trigger {
     /* 0x04 */ s32 varIndex;
     /* 0x08 */ union {
         s32 colliderID;
-        Vec4f* position;
+        Vec4f* pos;
     } location;
     /* 0x0C */ s32 (*onActivateFunc)(struct Trigger*);
     /* 0x10 */ EvtScript* onTriggerEvt;
@@ -468,7 +468,7 @@ typedef struct Evt {
     /* 0x154 */ f32 frameCounter;
     /* 0x158 */ s32 unk_158;
     /* 0x15C */ Bytecode* ptrFirstLine;
-    /* 0x160 */ Bytecode* ptrSavedPosition;
+    /* 0x160 */ Bytecode* ptrSavedPos;
     /* 0x164 */ Bytecode* ptrCurrentLine;
 } Evt; // size = 0x168
 
@@ -2431,7 +2431,7 @@ typedef struct CreditsEntry {
 
 typedef struct CreditsLine {
     /* 0x00 */ u8* message;
-    /* 0x04 */ s32 unk__04;
+    /* 0x04 */ char unk_04[0x4];
     /* 0x08 */ s32 time;
     /* 0x0C */ s32 state;
     /* 0x10 */ s32 palette;
@@ -2439,23 +2439,14 @@ typedef struct CreditsLine {
     /* 0x18 */ s32 appearMode;
     /* 0x1C */ s32 appearTime;
     /* 0x20 */ s32 perCharDelayIn;
-    /* 0x24 */ s32 unk__24;
-    /* 0x28 */ s32 unk__28;
-    /* 0x2C */ s32 unk__2C;
-    /* 0x30 */ s32 unk__30;
+    /* 0x24 */ char unk_24[0x10];
     /* 0x34 */ s32 holdMode;
     /* 0x38 */ s32 holdTime;
-    /* 0x3C */ s32 unk__3C;
-    /* 0x40 */ s32 unk__40;
-    /* 0x44 */ s32 unk__44;
-    /* 0x48 */ s32 unk__48;
+    /* 0x3C */ char unk_3C[0x10];
     /* 0x4C */ s32 vanishMode;
     /* 0x50 */ s32 vanishTime;
     /* 0x54 */ s32 perCharDelayOut;
-    /* 0x58 */ s32 unk__58;
-    /* 0x5C */ s32 unk__5C;
-    /* 0x60 */ s32 unk__60;
-    /* 0x64 */ s32 unk__64;
+    /* 0x58 */ char unk_58[0x10];
     /* 0x68 */ s32 posX;
     /* 0x6C */ s32 posY;
     /* 0x70 */ s16 flags;
diff --git a/include/enums.h b/include/enums.h
index 2965cec404..92d245c665 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -594,6 +594,7 @@ enum SoundIDs {
     SOUND_AA                        = 0x000000AA,
     SOUND_AB                        = 0x000000AB,
     SOUND_AC                        = 0x000000AC,
+    SOUND_B0                        = 0x000000B0,
     SOUND_B1                        = 0x000000B1,
     SOUND_B2                        = 0x000000B2,
     SOUND_B4                        = 0x000000B4,
diff --git a/src/181810.c b/src/181810.c
index 518a2d6423..bf2abf5421 100644
--- a/src/181810.c
+++ b/src/181810.c
@@ -489,7 +489,7 @@ ApiStatus ApplyShrinkFromOwner(Evt* script, s32 isInitialCall) {
         amt /= 2;
     }
 
-    evt_set_variable(script, *args, amt);
+    evt_set_variable(script, *args++, amt);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/B0E0.c b/src/B0E0.c
index b45fd5be51..8ae272a7bb 100644
--- a/src/B0E0.c
+++ b/src/B0E0.c
@@ -957,9 +957,9 @@ void update_camera_zone_interp(Camera* camera) {
         boomYawDiff = settingDiff;
     }
 
-    deltaX = camera->oldCameraSettings.position.x - camera->newCameraSettings.position.x;
-    deltaY = camera->oldCameraSettings.position.y - camera->newCameraSettings.position.y;
-    deltaZ = camera->oldCameraSettings.position.z - camera->newCameraSettings.position.z;
+    deltaX = camera->oldCameraSettings.pos.x - camera->newCameraSettings.pos.x;
+    deltaY = camera->oldCameraSettings.pos.y - camera->newCameraSettings.pos.y;
+    deltaZ = camera->oldCameraSettings.pos.z - camera->newCameraSettings.pos.z;
     settingDiff = SQ(deltaX);
     settingDiff += SQ(deltaY);
     settingDiff += SQ(deltaZ);
@@ -1011,9 +1011,9 @@ void update_camera_zone_interp(Camera* camera) {
     blendedCamSettings.boomLength = (camera->oldCameraSettings.boomLength * interpAlphaInv) + (camera->newCameraSettings.boomLength * interpAlpha);
     blendedCamSettings.boomPitch = (camera->oldCameraSettings.boomPitch * interpAlphaInv) + (camera->newCameraSettings.boomPitch * interpAlpha);
     blendedCamSettings.viewPitch = (camera->oldCameraSettings.viewPitch * interpAlphaInv) + (camera->newCameraSettings.viewPitch * interpAlpha);
-    blendedCamSettings.position.x = (camera->oldCameraSettings.position.x * interpAlphaInv) + (camera->newCameraSettings.position.x * interpAlpha);
-    blendedCamSettings.position.y = (camera->oldCameraSettings.position.y * interpAlphaInv) + (camera->newCameraSettings.position.y * interpAlpha);
-    blendedCamSettings.position.z = (camera->oldCameraSettings.position.z * interpAlphaInv) + (camera->newCameraSettings.position.z * interpAlpha);
+    blendedCamSettings.pos.x = (camera->oldCameraSettings.pos.x * interpAlphaInv) + (camera->newCameraSettings.pos.x * interpAlpha);
+    blendedCamSettings.pos.y = (camera->oldCameraSettings.pos.y * interpAlphaInv) + (camera->newCameraSettings.pos.y * interpAlpha);
+    blendedCamSettings.pos.z = (camera->oldCameraSettings.pos.z * interpAlphaInv) + (camera->newCameraSettings.pos.z * interpAlpha);
     blendedCamSettings.boomLength *= camera->zoomPercent;
     blendedCamSettings.boomLength *= 0.01;
 
@@ -1025,21 +1025,21 @@ void update_camera_zone_interp(Camera* camera) {
     sinViewPitch = sin_deg(blendedCamSettings.boomPitch + D_800A08DC);
 
     if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) {
-        camera->lookAt_eye.y = blendedCamSettings.position.y + (blendedCamSettings.boomLength * sinViewPitch);
+        camera->lookAt_eye.y = blendedCamSettings.pos.y + (blendedCamSettings.boomLength * sinViewPitch);
     }
 
-    camera->lookAt_eye.x = blendedCamSettings.position.x - (temp_f26 * blendedCamSettings.boomLength * cosViewPitch);
-    camera->lookAt_eye.z = blendedCamSettings.position.z - (temp_f24_2 * blendedCamSettings.boomLength * cosViewPitch);
+    camera->lookAt_eye.x = blendedCamSettings.pos.x - (temp_f26 * blendedCamSettings.boomLength * cosViewPitch);
+    camera->lookAt_eye.z = blendedCamSettings.pos.z - (temp_f24_2 * blendedCamSettings.boomLength * cosViewPitch);
     cosViewPitch = cos_deg(-blendedCamSettings.viewPitch);
     sinViewPitch = sin_deg(-blendedCamSettings.viewPitch);
 
-    if (camera->lookAt_eye.x == blendedCamSettings.position.x && camera->lookAt_eye.z == blendedCamSettings.position.z) {
+    if (camera->lookAt_eye.x == blendedCamSettings.pos.x && camera->lookAt_eye.z == blendedCamSettings.pos.z) {
         dist = 0.0f;
     } else {
-        dist = dist2D(camera->lookAt_eye.x, camera->lookAt_eye.z, blendedCamSettings.position.x, blendedCamSettings.position.z);
+        dist = dist2D(camera->lookAt_eye.x, camera->lookAt_eye.z, blendedCamSettings.pos.x, blendedCamSettings.pos.z);
     }
 
-    temp_f8_2 = blendedCamSettings.position.y - camera->lookAt_eye.y;
+    temp_f8_2 = blendedCamSettings.pos.y - camera->lookAt_eye.y;
     if (!(camera->moveFlags & CAMERA_MOVE_FLAGS_2)) {
         camera->lookAt_obj.y = camera->lookAt_eye.y + ((dist * sinViewPitch) + (temp_f8_2 * cosViewPitch));
     }
diff --git a/src/actor_api.c b/src/actor_api.c
index 7202048986..ca3e977808 100644
--- a/src/actor_api.c
+++ b/src/actor_api.c
@@ -2480,7 +2480,7 @@ INCLUDE_ASM(s32, "actor_api", func_8026E558);
 ApiStatus GetTargetListLength(Evt* script) {
     Bytecode* args = script->ptrReadPos;
 
-    evt_set_variable(script, *args, get_actor(script->owner1.actorID)->targetListLength);
+    evt_set_variable(script, *args++, get_actor(script->owner1.actorID)->targetListLength);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/common/CalculateArcsinDeg.inc.c b/src/common/CalculateArcsinDeg.inc.c
index 9d40111a71..958da5a9ff 100644
--- a/src/common/CalculateArcsinDeg.inc.c
+++ b/src/common/CalculateArcsinDeg.inc.c
@@ -65,10 +65,10 @@ ApiStatus N(CalculateArcsinDeg)(Evt* script, s32 isInitialCall) {
     y2 -= y1;
 
     if (x2 == 0 && y2 == 0) {
-        evt_set_variable(script, *args, outVar);
+        evt_set_variable(script, *args++, outVar);
         return ApiStatus_DONE2;
     } else {
-        evt_set_variable(script, *args, N(ArcsinDeg)(x2, y2) - 90);
+        evt_set_variable(script, *args++, N(ArcsinDeg)(x2, y2) - 90);
         return ApiStatus_DONE2;
     }
 }
diff --git a/src/encounter_api.c b/src/encounter_api.c
index 0713601aed..35c56ff40e 100644
--- a/src/encounter_api.c
+++ b/src/encounter_api.c
@@ -624,7 +624,7 @@ ApiStatus SetSelfVar(Evt* script, s32 isInitialCall) {
 ApiStatus GetSelfVar(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    evt_set_variable(script, *args, script->owner1.enemy->varTable[evt_get_variable(script, *args++)]);
+    evt_set_variable(script, *args++, script->owner1.enemy->varTable[evt_get_variable(script, *args++)]);
     return ApiStatus_DONE2;
 }
 
@@ -755,7 +755,7 @@ ApiStatus GetSelfAnimationFromTable(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     Enemy* owner = script->owner1.enemy;
 
-    evt_set_variable(script, *args, owner->animList[evt_get_variable(script, *args++)]);
+    evt_set_variable(script, *args++, owner->animList[evt_get_variable(script, *args++)]);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/evt/evt.c b/src/evt/evt.c
index f5978234f6..0defe8be45 100644
--- a/src/evt/evt.c
+++ b/src/evt/evt.c
@@ -1333,7 +1333,7 @@ s32 evt_handle_print_debug_var(Evt* script) {
 }
 
 ApiStatus func_802C739C(Evt* script) {
-    script->ptrSavedPosition = (Bytecode*)*script->ptrReadPos;
+    script->ptrSavedPos = (Bytecode*)*script->ptrReadPos;
     return ApiStatus_DONE2;
 }
 
diff --git a/src/evt/f8f60_len_1560.c b/src/evt/f8f60_len_1560.c
index d47d2fdc87..3549894ce4 100644
--- a/src/evt/f8f60_len_1560.c
+++ b/src/evt/f8f60_len_1560.c
@@ -537,7 +537,7 @@ ApiStatus SetGameMode(Evt* script, s32 isInitialCall) {
 ApiStatus ClampAngleInt(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    evt_set_variable(script, *args, clamp_angle(evt_get_variable(script, *args)));
+    evt_set_variable(script, *args++, clamp_angle(evt_get_variable(script, *args)));
 
     return ApiStatus_DONE2;
 }
@@ -545,7 +545,7 @@ ApiStatus ClampAngleInt(Evt* script, s32 isInitialCall) {
 ApiStatus ClampAngleFloat(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    evt_set_float_variable(script, *args, clamp_angle(evt_get_float_variable(script, *args)));
+    evt_set_float_variable(script, *args++, clamp_angle(evt_get_float_variable(script, *args)));
 
     return ApiStatus_DONE2;
 }
diff --git a/src/evt/player_api.c b/src/evt/player_api.c
index 93a21dab76..bf6f630df3 100644
--- a/src/evt/player_api.c
+++ b/src/evt/player_api.c
@@ -617,7 +617,7 @@ ApiStatus IsPlayerOnValidFloor(Evt* script, s32 isInitialCall) {
     if (gCollisionStatus.currentFloor >= 0) {
         result = (func_802D23F8() != 0);
     }
-    evt_set_variable(script, *args, result);
+    evt_set_variable(script, *args++, result);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/evt/script_list.c b/src/evt/script_list.c
index a67db90c7b..b5d0daf462 100644
--- a/src/evt/script_list.c
+++ b/src/evt/script_list.c
@@ -266,7 +266,7 @@ Evt* start_script(EvtScript* source, s32 priority, s32 initialState) {
     newScript->loopDepth = -1;
     newScript->switchDepth = -1;
     newScript->groupFlags = ~EVT_GROUP_10;
-    newScript->ptrSavedPosition = NULL;
+    newScript->ptrSavedPos = NULL;
     newScript->frameCounter = 0.0f;
     newScript->unk_158 = 0;
     newScript->timeScale = gGlobalTimeSpace;
@@ -338,7 +338,7 @@ Evt* start_script_in_group(EvtScript* source, u8 priority, u8 initialState, u8 g
         newScript->loopDepth = -1;
         newScript->switchDepth = -1;
         newScript->groupFlags = groupFlags;
-        newScript->ptrSavedPosition = 0;
+        newScript->ptrSavedPos = 0;
         newScript->frameCounter = 0.0f;
         newScript->unk_158 = 0;
         newScript->timeScale = gGlobalTimeSpace;
@@ -407,7 +407,7 @@ Evt* start_child_script(Evt* parentScript, EvtScript* source, s32 initialState)
     child->loopDepth = -1;
     child->switchDepth = -1;
     child->groupFlags = parentScript->groupFlags;
-    child->ptrSavedPosition = NULL;
+    child->ptrSavedPos = NULL;
     child->array = parentScript->array;
     child->flagArray = parentScript->flagArray;
     child->timeScale = gGlobalTimeSpace;
@@ -475,7 +475,7 @@ Evt* func_802C39F8(Evt* parentScript, Bytecode* nextLine, s32 newState) {
     child->loopDepth = -1;
     child->switchDepth = -1;
     child->groupFlags = parentScript->groupFlags;
-    child->ptrSavedPosition = NULL;
+    child->ptrSavedPos = NULL;
     child->array = parentScript->array;
     child->flagArray = parentScript->flagArray;
     child->timeScale = gGlobalTimeSpace;
diff --git a/src/trigger.c b/src/trigger.c
index 6fa9d9fbcc..da6ae8e16a 100644
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -192,7 +192,7 @@ void update_triggers(void) {
                 continue;
             }
 
-            triggerPos = listTrigger->location.position;
+            triggerPos = listTrigger->location.pos;
             dist = dist3D(triggerPos->x, triggerPos->y, triggerPos->z,
                                 collisionStatus->bombetteExplosionPos.x, collisionStatus->bombetteExplosionPos.y,
                                 collisionStatus->bombetteExplosionPos.z);
diff --git a/src/world/area_hos/hos_04/A274B0.c b/src/world/area_hos/hos_04/A274B0.c
index 31f6bd6e1a..fa8a5a3b01 100644
--- a/src/world/area_hos/hos_04/A274B0.c
+++ b/src/world/area_hos/hos_04/A274B0.c
@@ -4,7 +4,7 @@
 extern f32 D_80241B54_A28A24;
 extern f32 D_80241B74_A28A44;
 extern f32 D_80241B7C_A28A4C;
-extern s32 D_80241B80_A28A50;
+extern u16* D_80241B80_A28A50;
 extern s32 D_80241B84_A28A54;
 extern s32 D_80241B88_A28A58;
 extern f32 D_80243370;
diff --git a/src/world/area_hos/hos_05/A2AAC0.c b/src/world/area_hos/hos_05/A2AAC0.c
index c9870293d3..bca647b750 100644
--- a/src/world/area_hos/hos_05/A2AAC0.c
+++ b/src/world/area_hos/hos_05/A2AAC0.c
@@ -1,7 +1,99 @@
 #include "hos_05.h"
 #include "model.h"
+#include "effects.h"
+#include "nu/nusys.h"
+#include "ld_addrs.h"
 
+typedef struct UnkHosStruct {
+    /* 0x00 */ s32 unk_00; // entity ID
+    /* 0x04 */ IMG_PTR unk_04;
+    /* 0x08 */ PAL_PTR unk_08;
+    /* 0x0C */ IMG_PTR unk_0C;
+    /* 0x10 */ PAL_PTR unk_10;
+    /* 0x14 */ char unk_14[0x4];
+    /* 0x18 */ IMG_PTR unk_18;
+    /* 0x1C */ IMG_PTR unk_1C;
+    /* 0x20 */ PAL_PTR unk_20;
+    /* 0x24 */ char unk_24[0x18];
+    /* 0x3C */ s16 unk_3C;
+    /* 0x3E */ s16 unk_3E;
+    /* 0x40 */ s16 unk_40;
+    /* 0x42 */ s16 unk_42;
+    /* 0x44 */ u16 unk_44; // x
+    /* 0x46 */ u16 unk_46; // y
+    /* 0x48 */ s16 unk_48; // x
+    /* 0x4A */ s16 unk_4A; // y
+    /* 0x4C */ char unk_4C[0xC];
+    /* 0x58 */ s16 unk_58; // bool
+    /* 0x5A */ s16 unk_5A;
+    /* 0x5C */ s16 unk_5C; // alpha
+    /* 0x60 */ char unk_6E[0x2];
+} UnkHosStruct; // size = 0x60
+
+extern f32 D_8024987C_A33ABC;
+extern f32 D_802498A8_A33AE8;
+extern s32 D_80249900_A33B40;
+extern f32 D_80249904_A33B44;
+extern s32 D_80249908_A33B48;
+extern f32 D_8024990C_A33B4C;
+extern s32 D_80249910_A33B50;
+extern s16 D_80249914_A33B54[];
+extern s16 D_80249934_A33B74[];
+extern s32 D_8024995C_A33B9C;
+extern s16 D_80249960_A33BA0[];
+extern f32 D_80249980_A33BC0;
+extern s32 D_80249984_A33BC4;
+extern s16 D_80249988_A33BC8[];
+extern s16 D_802499A8_A33BE8[][2];
+extern s32 D_80249A48_A33C88;
+extern s16 D_80249A4C_A33C8C[];
+extern f32 D_80249A6C_A33CAC;
+extern s32 D_80249A70_A33CB0;
+extern f32 D_80249A74_A33CB4;
+extern s32 D_80249A78_A33CB8;
+extern s32 D_80249A7C_A33CBC;
+extern s32 D_80249A80_A33CC0;
+extern f32 D_80249A84_A33CC4;
+extern f32 D_80249A88_A33CC8;
+extern f32 D_80249A8C_A33CCC;
+extern s32 D_80249A90_A33CD0;
+extern f32 D_80249A94_A33CD4;
+extern f32 D_80249A98_A33CD8;
+extern f32 D_80249A9C_A33CDC;
+extern f32 D_80249AA0_A33CE0;
+extern s32 D_80249AA4_A33CE4;
+extern f32 D_8024A9C8_A34C08;
+extern s32 D_8024A9CC_A34C0C;
+extern UnkHosStruct* D_8024AA20_A34C60;
 extern Gfx D_8024AA28_A34C68[];
+extern u32 D_8024AAB0_A34CF0;
+extern s32 D_8024AAB4_A34CF4; // func_802440D0_A2E310 can be matched once this is migrated
+extern s32 D_8024AAB8_A34CF8;
+extern u32 D_8024AABC_A34CFC;
+extern s32 D_8024AAC0_A34D00[];
+extern s32 D_8024AAD6_A34D14[];
+extern u8 D_8024AB3C_A34D7C[];
+extern u8 D_8024AC7B_A34EBB;
+extern u16 D_8024AC7C_A34EBC[];
+extern u16 D_8024AC9C_A34EDC[];
+extern s32 D_8024ACB8_A34EF8;
+extern f32 D_8024AEC4_A35104;
+extern f32 D_8024AEC8_A35108;
+
+// BSS?
+extern f32 D_8024F2C8;
+extern f32 D_8024F2CC;
+extern f32 D_8024F2D8;
+extern f32 D_8024F2DC;
+extern f32 D_8024F2E0;
+extern f32 D_8024F2E4;
+extern f32 D_8024F2E8;
+extern f32 D_8024F2EC;
+extern f32 D_8024F2F0_C0CB70;
+extern f32 D_8024F2F4;
+extern f32 D_8024F2F8;
+extern f32 D_8024F374;
+extern f32 D_8024F378;
 
 ApiStatus func_80240880_A2AAC0(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -119,47 +211,399 @@ void func_80241044_A2B284(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32* arg4) {
     }
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802410E4_A2B324);
+void func_802410E4_A2B324(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32* arg5) {
+    f32 var_f12_2;
+
+    if (arg3 > arg4) {
+        arg3 = arg4;
+    }
+
+    switch (arg0) {
+        case 1:
+            var_f12_2 = sin_deg((arg3 / arg4) * 90.0f);
+            break;
+        case 2:
+            if (arg3 < 30.0f) {
+                var_f12_2 = 0.0f;
+            } else {
+                var_f12_2 = sin_deg((((arg3 - 30.0f) / (arg4 - 30.0f)) * 90.0f) + -90.0f) + 1.0f;
+            }
+            break;
+        case 3:
+            var_f12_2 = (sin_deg(((arg3 / arg4) * 180.0f) - 90.0f) + 1.0f) * 0.5;
+            break;
+        case 4:
+            var_f12_2 = sin_deg(((arg3 / arg4) * 90.0f) - 90.0f) + 1.0f;
+            break;
+        default:
+            var_f12_2 = arg3 / arg4;
+            break;
+    }
+    *arg5 = arg1 + ((arg2 - arg1) * var_f12_2);
+}
 
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241274_A2B4B4);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024146C_A2B6AC);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802416BC_A2B8FC);
+ApiStatus func_802416BC_A2B8FC(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241850_A2BA90);
+    if (isInitialCall) {
+        camera->flags |= CAMERA_FLAGS_SHAKING;
+    }
+    guTranslateF(camera->viewMtxShaking,
+        D_80249904_A33B44 * sin_deg(D_80249900_A33B40 * 486),
+        D_80249904_A33B44 * cos_deg(D_80249900_A33B40 * 254),
+        0.0f
+    );
+    D_80249900_A33B40++;
+    D_80249904_A33B44 += (12.0f - D_80249904_A33B44) * 0.2;
+    if (D_80249900_A33B40 > 20) {
+        guTranslateF(camera->viewMtxShaking, 0.0f, 0.0f, 0.0f);
+        camera->flags &= ~CAMERA_FLAGS_SHAKING;
+        return ApiStatus_DONE1;
+    }
+    return ApiStatus_BLOCK;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802419F4_A2BC34);
+ApiStatus func_80241850_A2BA90(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+    Matrix4f sp18;
+    f32 x, y;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241B40_A2BD80);
+    if (isInitialCall) {
+        camera->flags |= CAMERA_FLAGS_SHAKING;
+    }
+    x = D_8024990C_A33B4C * sin_deg(D_80249908_A33B48 * 486);
+    y = D_8024990C_A33B4C * cos_deg(D_80249908_A33B48 * 254);
+    guTranslateF(camera->viewMtxShaking, x, y, 0.0f);
+    guTranslateF(camera->viewMtxShaking, x, y, 0.0f);
+    guRotateF(sp18, 20.0f, 0.0f, 0.0f, 1.0f);
+    guMtxCatF(sp18, camera->viewMtxShaking, camera->viewMtxShaking);
+    camera->panActive = TRUE;
+    if (D_80249908_A33B48 >= 10) {
+        guRotateF(camera->viewMtxShaking, 20.0f, 0.0f, 0.0f, 1.0f);
+        return ApiStatus_DONE1;
+    }
+    D_80249908_A33B48++;
+    return ApiStatus_BLOCK;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241C54_A2BE94);
+ApiStatus func_802419F4_A2BC34(Evt* script, s32 isInitialCall) {
+    Npc* npc7 = resolve_npc(script, 7);
+    Npc* npc8 = resolve_npc(script, 8);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241D08_A2BF48);
+    if (isInitialCall) {
+        npc7->pos.x = -64.0f;
+        npc7->pos.y = 400.0f;
+        npc7->pos.z = 85.0f;
+        npc8->pos.x = -64.0f;
+        npc8->pos.y = 400.0f;
+        npc8->pos.z = 85.0f;
+        npc7->colliderPos.x = npc7->pos.x;
+        npc8->colliderPos.x = npc8->pos.x;
+        npc7->colliderPos.z = npc7->pos.z;
+        npc8->colliderPos.z = npc8->pos.z;
+        D_8024F2C8 = 400.0f;
+    }
+    if (D_80249910_A33B50 < 20) {
+        npc7->pos.y = D_80249934_A33B74[D_80249910_A33B50];
+    } else {
+        npc7->pos.y += D_80249914_A33B54[((D_80249910_A33B50 - 20) & 30) / 2] * 0.1f;
+    }
+    npc8->pos.y = npc7->pos.y;
+    npc7->colliderPos.y = npc7->pos.y;
+    npc8->colliderPos.y = npc8->pos.y;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241D7C_A2BFBC);
+    D_80249910_A33B50++;
+    if (D_80249910_A33B50 < 2000) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241F54_A2C194);
+ApiStatus func_80241B40_A2BD80(Evt* script, s32 isInitialCall) {
+    Npc* npc7 = resolve_npc(script, 7);
+    Npc* npc8 = resolve_npc(script, 8);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", update_heroes_start_turn_A2C264);
+    if (isInitialCall) {
+        npc7->pos.x = -64.0f;
+        npc7->pos.y = 135.0f;
+        npc7->pos.z = 85.0f;
+        npc8->pos.x = -64.0f;
+        npc8->pos.y = 135.0f;
+        npc8->pos.z = 85.0f;
+        npc7->colliderPos.x = npc7->pos.x;
+        npc8->colliderPos.x = npc8->pos.x;
+        npc7->colliderPos.z = npc7->pos.z;
+        npc8->colliderPos.z = npc8->pos.z;
+        D_8024F2CC = 135.0f;
+    }
+    npc7->pos.y += D_80249960_A33BA0[((u32) (D_8024995C_A33B9C - 20) & 30) / 2] * 0.1f;
+    npc8->pos.y = npc7->pos.y;
+    npc7->colliderPos.y = npc7->pos.y;
+    npc8->colliderPos.y = npc8->pos.y;
+    D_8024995C_A33B9C++;
+    if (D_8024995C_A33B9C < 2000) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802421E0_A2C420);
+ApiStatus func_80241C54_A2BE94(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802422A0_A2C4E0);
+    func_80241044_A2B284(30.0f, 15.0f, D_80249980_A33BC0, 1.0f, &D_80249980_A33BC0);
+    func_80240D54_A2AF94(0, D_80249980_A33BC0);
+    camera->panActive = TRUE;
+    if (D_80249980_A33BC0 == 15.0f) {
+        return ApiStatus_DONE1;
+    }
+    return ApiStatus_BLOCK;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802423D4_A2C614);
+ApiStatus func_80241D08_A2BF48(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802425A0_A2C7E0);
+    if (isInitialCall) {
+        camera->flags &= ~CAMERA_FLAGS_SHAKING;
+    }
+    guTranslateF(camera->viewMtxShaking, 0.0f, 0.0f, 0.0f);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80242704_A2C944);
+ApiStatus func_80241D7C_A2BFBC(Evt* script, s32 isInitialCall) {
+    Npc* npc = resolve_npc(script, 9);
+
+    if (isInitialCall) {
+        npc->pos.x = -145.0f;
+        npc->pos.z = 114.0f;
+        npc->yaw = 270.0f;
+        npc->colliderPos.x = npc->pos.x;
+        npc->colliderPos.z = npc->pos.z;
+    }
+    if (D_80249984_A33BC4 == 30) {
+        npc->yaw = 90.0f;
+    }
+    if (D_80249984_A33BC4 < 40) {
+        npc->pos.x = D_802499A8_A33BE8[D_80249984_A33BC4][0] - 145;
+        npc->pos.y = (((D_802499A8_A33BE8[D_80249984_A33BC4][1] - 135) * 200) / 225) + 147;
+        if (D_80249984_A33BC4 < 20) {
+            npc->pos.z = 114.0f - (D_80249984_A33BC4 * 30.0f) / 20.0f;
+        } else {
+            npc->pos.z = 84.0f;
+        }
+        npc->colliderPos.x = npc->pos.x;
+        npc->colliderPos.z = npc->pos.z;
+    } else {
+        npc->pos.y += D_80249988_A33BC8[((D_80249984_A33BC4 - 40) & 30) / 2] * 0.1f;
+    }
+    npc->colliderPos.y = npc->pos.y;
+    D_80249984_A33BC4++;
+    if (D_80249984_A33BC4 < 2000) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
+
+ApiStatus func_80241F54_A2C194(Evt* script, s32 isInitialCall) {
+    Npc* npc = resolve_npc(script, 9);
+
+    if (isInitialCall) {
+        npc->pos.x = -145.0f;
+        npc->pos.z = 84.0f;
+        npc->colliderPos.x = npc->pos.x;
+        npc->colliderPos.z = npc->pos.z;
+        npc->yaw = 90.0f;
+        npc->pos.y = 147.0f;
+    }
+    npc->pos.y += D_80249A4C_A33C8C[((D_80249A48_A33C88 - 40) & 30) / 2] * 0.1f;
+    npc->colliderPos.y = npc->pos.y;
+
+    D_80249A48_A33C88++;
+    if (D_80249A48_A33C88 < 2000) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
+
+ApiStatus func_80242024_A2C264(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    func_802410E4_A2B324(0, 121.6f, 90.0f, D_80249A70_A33CB0, 40.0f, &D_80249A6C_A33CAC);
+    camera->panActive = TRUE;
+    camera->controlSettings.boomLength = D_80249A6C_A33CAC;
+    if ((D_80249A70_A33CB0 == ((D_80249A70_A33CB0 / 5) * 5)) && (D_80249A6C_A33CAC != 90.0f)) {
+        f32 temp_f4 = resolve_npc(script, 7)->pos.y - 150.0f;
+
+        fx_fire_breath(
+            1, script->varTable[0],
+            script->varTable[1] + temp_f4,
+            script->varTable[2],
+            script->varTable[3] - 5,
+            script->varTable[4] + temp_f4,
+            script->varTable[5] - 30, 0, 5, 20
+        );
+    }
+
+    D_80249A70_A33CB0++;
+    if (D_80249A70_A33CB0 <= 40) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
+
+ApiStatus func_802421E0_A2C420(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    func_802410E4_A2B324(4, 90.0f, 474.7f, D_80249A78_A33CB8, 20.0f, &D_80249A74_A33CB4);
+    camera->panActive = TRUE;
+    camera->controlSettings.boomLength = D_80249A74_A33CB4;
+    D_80249A78_A33CB8++;
+    if (D_80249A78_A33CB8 < 21) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
+
+ApiStatus func_802422A0_A2C4E0(Evt* script, s32 isInitialCall) {
+    Npc* npc7 = resolve_npc(script, 7);
+    Npc* npc8 = resolve_npc(script, 8);
+
+    if (isInitialCall) {
+        D_8024F2D8 = npc7->pos.x;
+        D_8024F2DC = npc7->pos.z;
+    }
+    func_802410E4_A2B324(3, D_8024F2D8, 0.0f, D_80249A7C_A33CBC, 40.0f, &npc7->pos.x);
+    func_802410E4_A2B324(3, D_8024F2DC, 0.0f, D_80249A7C_A33CBC, 40.0f, &npc7->pos.z);
+    npc8->pos.x = npc7->pos.x;
+    npc8->pos.z = npc7->pos.z;
+    npc7->colliderPos.x = npc7->pos.x;
+    npc7->colliderPos.z = npc7->pos.z;
+    npc8->colliderPos.x = npc8->pos.x;
+    npc8->colliderPos.z = npc8->pos.z;
+
+    D_80249A7C_A33CBC++;
+    if (D_80249A7C_A33CBC <= 40) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
+
+ApiStatus func_802423D4_A2C614(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    func_802410E4_A2B324(4, 35.0f, 35.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2E0);
+    func_802410E4_A2B324(4, 130.0f, 270.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2E4);
+    func_802410E4_A2B324(4, 30.0f, 0.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2E8);
+    func_802410E4_A2B324(4, 232.0f, 177.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2EC);
+    func_802410E4_A2B324(4, 0.0f, 0.0f, D_80249A80_A33CC0, 80.0f, &D_8024F2F0_C0CB70);
+    func_80240D54_A2AF94(0, D_8024F2E0);
+    camera->panActive = TRUE;
+    camera->controlSettings.boomLength = D_8024F2E4;
+    camera->movePos.x = D_8024F2E8;
+    camera->movePos.y = D_8024F2EC;
+    camera->movePos.z = D_8024F2F0_C0CB70;
+
+    D_80249A80_A33CC0++;
+    if (D_80249A80_A33CC0 <= 90) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
+
+ApiStatus func_802425A0_A2C7E0(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    func_802410E4_A2B324(0, 40.0f, -130.0f, D_80249A90_A33CD0, 170.0f, &D_80249A84_A33CC4);
+    func_802410E4_A2B324(0, -40.0f, 130.0f, D_80249A90_A33CD0, 170.0f, &D_80249A88_A33CC8);
+    func_802410E4_A2B324(3, 45.0f, 25.0f, D_80249A90_A33CD0, 170.0f, &D_80249A8C_A33CCC);
+    camera->panActive = TRUE;
+    camera->movePos.x = D_80249A84_A33CC4;
+    camera->movePos.z = D_80249A88_A33CC8;
+    camera->controlSettings.posB.x = sin_deg(D_80249A8C_A33CCC) * 500.0f;
+    camera->controlSettings.posB.z = cos_deg(D_80249A8C_A33CCC) * 500.0f;
+
+    D_80249A90_A33CD0++;
+    if (D_80249A90_A33CD0 == 170) {
+        return ApiStatus_DONE1;
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_80242704_A2C944(void) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    func_802410E4_A2B324(3, 25.0f, 200.0f, D_80249AA4_A33CE4, 120.0f, &D_80249AA0_A33CE0);
+    func_802410E4_A2B324(3, 50.0f, 35.0f, D_80249AA4_A33CE4, 30.0f, &D_80249A94_A33CD4);
+    func_802410E4_A2B324(3, 246.1f, 180.0f, D_80249AA4_A33CE4, 30.0f, &D_80249A98_A33CD8);
+    func_802410E4_A2B324(3, 200.0f, 220.0f, D_80249AA4_A33CE4, 30.0f, &D_80249A9C_A33CDC);
+    camera->controlSettings.posB.x = sin_deg(D_80249AA0_A33CE0) * 500.0f;
+    camera->controlSettings.posB.z = cos_deg(D_80249AA0_A33CE0) * 500.0f;
+    func_80240D54_A2AF94(0, D_80249A94_A33CD4);
+    camera->panActive = TRUE;
+    camera->controlSettings.boomLength = D_80249A98_A33CD8;
+    camera->movePos.y = D_80249A9C_A33CDC;
+    D_80249AA4_A33CE4++;
+    if (D_80249AA4_A33CE4 <= 120) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
 
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802428C8_A2CB08);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80242F74_A2D1B4);
+ApiStatus func_80242F74_A2D1B4(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024301C_A2D25C);
+    func_80241044_A2B284(D_8024987C_A33ABC, D_802498A8_A33AE8, D_8024A9C8_A34C08, 1.0f, &D_8024A9C8_A34C08);
+    camera->panActive = TRUE;
+    camera->controlSettings.boomLength = D_8024A9C8_A34C08;
+    if (D_8024A9C8_A34C08 == 700.0f) {
+        return ApiStatus_DONE1;
+    }
+    return ApiStatus_BLOCK;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243100_A2D340);
+ApiStatus func_8024301C_A2D25C(Evt* script, s32 isInitialCall) {
+    Npc* npc = resolve_npc(script, 9);
+
+    if (isInitialCall) {
+        D_8024F2F4 = npc->pos.x;
+        D_8024F2F8 = npc->pos.z;
+    }
+
+    func_802410E4_A2B324(3, D_8024F2F4, -95.0f, D_8024A9CC_A34C0C, 40.0f, &npc->pos.x);
+    func_802410E4_A2B324(3, D_8024F2F8, 20.0f, D_8024A9CC_A34C0C, 40.0f, &npc->pos.z);
+    npc->colliderPos.x = npc->pos.x;
+    npc->colliderPos.z = npc->pos.z;
+
+    D_8024A9CC_A34C0C++;
+    if (D_8024A9CC_A34C0C <= 40) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
+
+void func_80243164_A2D3A4(
+    s32 baseX, s32 baseY,
+    IMG_PTR img, PAL_PTR pal,
+    s32 alpha, s32 width, s32 height, s32 lineHeight
+);
+
+void func_80243100_A2D340(void) {
+    s32 x = D_8024AA20_A34C60->unk_44 << 0x10;
+    s32 y = D_8024AA20_A34C60->unk_46 << 0x10;
+
+    if (D_8024AA20_A34C60->unk_00 != 0) {
+        func_80243164_A2D3A4(
+            x >> 0x10, y >> 0x10,
+            D_8024AA20_A34C60->unk_1C, D_8024AA20_A34C60->unk_20,
+            255, 128, 128, 16
+        );
+    }
+}
 
 void func_80243164_A2D3A4(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal, s32 alpha, s32 width, s32 height, s32 lineHeight) {
     u8 overlayType;
@@ -205,7 +649,13 @@ void func_80243164_A2D3A4(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal, s32 al
     gDPPipeSync(gMasterGfxPos++);
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024370C_A2D94C);
+void func_8024370C_A2D94C(void) {
+    func_80243164_A2D3A4(
+        D_8024AA20_A34C60->unk_48, D_8024AA20_A34C60->unk_4A,
+        D_8024AA20_A34C60->unk_18, NULL,
+        D_8024AA20_A34C60->unk_5C, 128, 128, 32
+    );
+}
 
 void func_80243758_A2D998(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal) {
     s32 i;
@@ -230,22 +680,260 @@ void func_80243758_A2D998(s32 baseX, s32 baseY, IMG_PTR img, PAL_PTR pal) {
     gDPPipeSync(gMasterGfxPos++);
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243CC0_A2DF00);
+void func_80243CC0_A2DF00(void) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+    s32 vpX = camera->viewportStartX;
+    s32 vpY = camera->viewportStartY;
+    u8 sp10;
+    f32 sp14;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243ED0_A2E110);
+    func_8024370C_A2D94C();
+
+    gSPDisplayList(gMasterGfxPos++, D_8024AA28_A34C68);
+    gDPSetColorImage(gMasterGfxPos++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, nuGfxCfb_ptr);
+
+    if (D_8024AA20_A34C60->unk_5A < 255) {
+        gDPSetRenderMode(gMasterGfxPos++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
+        gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_8024AA20_A34C60->unk_5A);
+    }
+    get_screen_overlay_params(1, &sp10, &sp14);
+    if (sp14 != 0.0f) {
+        gDPSetCombineLERP(gMasterGfxPos++, PRIMITIVE, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1, PRIMITIVE, TEXEL0,
+                          PRIMITIVE_ALPHA, TEXEL0, 0, 0, 0, 1);
+        gDPSetPrimColor(gMasterGfxPos++, 0, 0, 208, 208, 208, (s32) sp14);
+    }
+
+    if (!D_8024AA20_A34C60->unk_58) {
+        func_80243758_A2D998(
+            vpX + D_8024AA20_A34C60->unk_40,
+            vpY + D_8024AA20_A34C60->unk_42,
+            D_8024AA20_A34C60->unk_0C,
+            D_8024AA20_A34C60->unk_10
+        );
+        func_80243758_A2D998(
+            vpX + D_8024AA20_A34C60->unk_3C,
+            vpY + D_8024AA20_A34C60->unk_3E,
+            D_8024AA20_A34C60->unk_04,
+            D_8024AA20_A34C60->unk_08
+        );
+    } else {
+        func_80243758_A2D998(
+            vpX + D_8024AA20_A34C60->unk_3C,
+            vpY + D_8024AA20_A34C60->unk_3E,
+            D_8024AA20_A34C60->unk_04,
+            D_8024AA20_A34C60->unk_08
+        );
+        func_80243758_A2D998(
+            vpX + D_8024AA20_A34C60->unk_40,
+            vpY + D_8024AA20_A34C60->unk_42,
+            D_8024AA20_A34C60->unk_0C,
+            D_8024AA20_A34C60->unk_10
+        );
+    }
+}
+
+void func_80243ED0_A2E110(s32 arg0, s32 idx) {
+    s32 i;
+
+    idx--;
+    if (idx < 0) {
+        u16* pal = D_8024AA20_A34C60->unk_08;
+
+        for (i = 0; i < 256; i++) {
+            *pal++ = 0xD6B5;
+        }
+        return;
+    }
+
+    if (!arg0) {
+        dma_copy(
+            title_bg_1_ROM_START + idx * 0xA910,
+            title_bg_1_ROM_START + (idx + 1) * 0xA910 ,
+            D_8024AA20_A34C60->unk_04
+        );
+    } else {
+        dma_copy(
+            title_bg_1_ROM_START + idx * 0xA910,
+            title_bg_1_ROM_START + (idx + 1) * 0xA910 ,
+            D_8024AA20_A34C60->unk_0C
+        );
+    }
+}
 
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243FC4_A2E204);
 
+// needs D_8024AAB4_A34CF4 to be migrated
+#ifdef NON_MATCHING
+ApiStatus func_802440D0_A2E310(Evt* script, s32 isInitialCall) {
+    switch (D_8024AAB0_A34CF0) {
+        case 0:
+            D_8024AAB0_A34CF0++;
+            D_8024AAB8_A34CF8 = D_8024AAC0_A34D00[D_8024AAB4_A34CF4];
+            break;
+        case 1:
+            if (D_8024AAB8_A34CF8 != 0) {
+                D_8024AAB8_A34CF8--;
+            } else {
+                D_8024AAB8_A34CF8 = 26;
+                D_8024AAB0_A34CF0++;
+                sfx_play_sound(SOUND_B0);
+            }
+            break;
+        case 2:
+            if (D_8024AAB8_A34CF8 != 0) {
+                D_8024AAB8_A34CF8--;
+                if (!D_8024AA20_A34C60->unk_58) {
+                    D_8024AA20_A34C60->unk_3C = D_8024AAD6_A34D14[25 - D_8024AAB8_A34CF8];
+                    D_8024AA20_A34C60->unk_3E = 0;
+                } else {
+                    D_8024AA20_A34C60->unk_40 = D_8024AAD6_A34D14[25 - D_8024AAB8_A34CF8];
+                    D_8024AA20_A34C60->unk_42 = 0;
+                }
+            } else {
+                D_8024AAB4_A34CF4++;
+                if (D_8024AAB4_A34CF4 + 1 < 5) {
+                    func_80243ED0_A2E110(D_8024AA20_A34C60->unk_58, D_8024AAB4_A34CF4 + 1);
+                    D_8024AAB0_A34CF0 = 0;
+                    D_8024AA20_A34C60->unk_3C = 0;
+                    D_8024AA20_A34C60->unk_3E = 0;
+                    D_8024AA20_A34C60->unk_40 = 0;
+                    D_8024AA20_A34C60->unk_42 = 0;
+                    D_8024AA20_A34C60->unk_58 = D_8024AA20_A34C60->unk_58 ^ 1;
+                } else {
+                    if (!D_8024AA20_A34C60->unk_58) {
+                        D_8024AA20_A34C60->unk_40 = 0;
+                        D_8024AA20_A34C60->unk_42 = 0;
+                    } else {
+                        D_8024AA20_A34C60->unk_3C = 0;
+                        D_8024AA20_A34C60->unk_3E = 0;
+                    }
+                    gCameras[CAM_DEFAULT].flags &= ~CAMERA_FLAGS_ENABLED;
+                    D_8024AAB0_A34CF0++;
+                }
+            }
+            break;
+        case 3:
+            D_8024AABC_A34CFC = 0;
+            D_8024AAB0_A34CF0++;
+            D_8024AAB8_A34CF8 = D_8024AAC0_A34D00[D_8024AAB4_A34CF4];
+            break;
+        case 4:
+            if (D_8024AAB8_A34CF8 != 0) {
+                if (D_8024AAB8_A34CF8 < D_8024AAC0_A34D00[D_8024AAB4_A34CF4] - 268) {
+                    u32 temp_v1 = D_8024AABC_A34CFC - 320;
+
+                    if (D_8024AABC_A34CFC < 320) {
+                        D_8024AA20_A34C60->unk_44 = D_8024AC7C_A34EBC[0];
+                        D_8024AA20_A34C60->unk_46 = D_8024AB3C_A34D7C[D_8024AABC_A34CFC];
+                    } else if (temp_v1 < 15) {
+                        D_8024AA20_A34C60->unk_44 = D_8024AC7C_A34EBC[temp_v1];
+                        if (temp_v1 < 13) {
+                            D_8024AA20_A34C60->unk_46 = D_8024AC7B_A34EBB + D_8024AC9C_A34EDC[temp_v1];
+                        }
+                    }
+                    D_8024AABC_A34CFC++;
+                }
+                D_8024AAB8_A34CF8--;
+            } else {
+                D_8024AAB8_A34CF8 = 26;
+                D_8024AAB0_A34CF0++;
+                D_8024AA20_A34C60->unk_5C = 255;
+                sfx_play_sound(SOUND_B0);
+            }
+            break;
+        case 5:
+            if (D_8024AAB8_A34CF8 != 0) {
+                D_8024AAB8_A34CF8--;
+                if (!D_8024AA20_A34C60->unk_58) {
+                    D_8024AA20_A34C60->unk_40 = D_8024AAD6_A34D14[25 - D_8024AAB8_A34CF8];
+                    D_8024AA20_A34C60->unk_42 = 0;
+                } else {
+                    D_8024AA20_A34C60->unk_3C = D_8024AAD6_A34D14[25 - D_8024AAB8_A34CF8];
+                    D_8024AA20_A34C60->unk_3E = 0;
+                }
+            } else {
+                D_8024AAB0_A34CF0++;
+            }
+            break;
+        case 6:
+        default:
+            return ApiStatus_DONE1;
+    }
+    return ApiStatus_BLOCK;
+}
+#else
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802440D0_A2E310);
+#endif
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244454_A2E694);
+ApiStatus func_80244454_A2E694(Evt* script, s32 isInitialCall) {
+    if (D_8024ACB8_A34EF8 != 0) {
+        D_8024ACB8_A34EF8--;
+        D_8024AA20_A34C60->unk_5C = (D_8024ACB8_A34EF8 * 255) / 30;
+        return ApiStatus_BLOCK;
+    } else {
+        D_8024AA20_A34C60->unk_5C = 0;
+        free_generic_entity(D_8024AA20_A34C60->unk_00);
+        D_8024AA20_A34C60->unk_00 = 0;
+        return ApiStatus_DONE1;
+    }
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802444E8_A2E728);
+ApiStatus func_802444E8_A2E728(Evt* script, s32 isInitialCall) {
+    Npc* npc = resolve_npc(script, 10);
+
+    npc->yaw = npc->renderYaw = 180.0f - gCameras[gCurrentCameraID].currentYaw;
+    return ApiStatus_BLOCK;
+}
 
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244550_A2E790);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244774_A2E9B4);
+ApiStatus func_80244774_A2E9B4(Evt* script, s32 isInitialCall) {
+    Npc* npc7 = resolve_npc(script, 7);
+    Npc* npc8 = resolve_npc(script, 8);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024486C_A2EAAC);
+    if (isInitialCall) {
+        D_8024F374 = npc7->pos.y;
+    }
+    func_802410E4_A2B324(3, D_8024F374, D_8024F374 + 500.0f, D_8024AEC4_A35104, 40.0f, &npc7->pos.y);
+    npc8->pos.y = npc7->pos.y;
+    npc7->colliderPos.y = npc7->pos.y;
+    npc8->colliderPos.y = npc8->pos.y;
+    D_8024AEC4_A35104++;
+    if (D_8024AEC4_A35104 > 40.0f) {
+        return ApiStatus_DONE1;
+    }
+    return ApiStatus_BLOCK;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244934_A2EB74);
+ApiStatus func_8024486C_A2EAAC(Evt* script, s32 isInitialCall) {
+    Npc* npc = resolve_npc(script, 9);
+
+    if (isInitialCall) {
+        D_8024F378 = npc->pos.y;
+    }
+    func_802410E4_A2B324(3, D_8024F378, D_8024F378 + 500.0f, D_8024AEC8_A35108, 40.0f, &npc->pos.y);
+    npc->colliderPos.y = npc->pos.y;
+    D_8024AEC8_A35108++;
+    if (D_8024AEC8_A35108 > 40.0f) {
+        return ApiStatus_DONE1;
+    }
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_80244934_A2EB74(Evt* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        script->functionTemp[0] = 0;
+        set_screen_overlay_params_back(1, 255.0f);
+        set_screen_overlay_color(1, 250, 250, 250);
+        return ApiStatus_BLOCK;
+    }
+    script->functionTemp[0]++;
+    if (script->functionTemp[0] == 10) {
+        set_screen_overlay_params_back(0, 0.0f);
+        set_screen_overlay_color(1, 250, 250, 250);
+        return ApiStatus_DONE2;
+    }
+    set_screen_overlay_params_back(1, (10 - script->functionTemp[0]) * 25);
+    set_screen_overlay_color(1, 250, 250, 250);
+    return ApiStatus_BLOCK;
+}
diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c
index 80beb6989c..db02bf733b 100644
--- a/src/world/area_hos/hos_06/A397F0.c
+++ b/src/world/area_hos/hos_06/A397F0.c
@@ -18,7 +18,16 @@ extern IconHudScriptPair gItemHudScripts[];
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 hos_06_D_80246260[];
 
diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c
index 11363895f3..33281ecfeb 100644
--- a/src/world/area_hos/hos_06/A3A230.c
+++ b/src/world/area_hos/hos_06/A3A230.c
@@ -8,9 +8,22 @@
 
 extern u8 D_802447D0_A3DCB0[];
 
+#define NAMESPACE dup_hos_06
+
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
+
+#define NAMESPACE hos_06
 
 extern s32 hos_06_D_80246430[];
 
@@ -62,11 +75,167 @@ ApiStatus func_802411F0_A3A6D0(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_8024126C_A3A74C);
+typedef struct UnkThing {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ s32 unk_04;
+    /* 0x08 */ s32 unk_08;
+} UnkThing; // size = 0xC
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802414E4_A3A9C4);
+extern UnkThing D_802447D4_A3DCB4[79];
+extern UnkThing D_80244B88_A3E068[16];
+extern UnkThing D_80244C48_A3E128[63];
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241668_A3AB48);
+ApiStatus func_8024126C_A3A74C(Evt* script, s32 isInitialCall) {
+    s32 temp_s6 = evt_get_variable(NULL, GameByte(0));
+    u32 count = 0;
+    UnkThing* it;
+    s32 temp_s5;
+    u32 i;
+
+    script->varTable[1] = 0;
+    for (i = 0, it = D_802447D4_A3DCB4; i < ARRAY_COUNT(D_802447D4_A3DCB4); i++, it++) {
+        if (temp_s6 >= it->unk_08 &&
+            func_802411BC_A3A69C(it->unk_04) == 0 &&
+            evt_get_variable(NULL, AreaFlag(3 + i)) == 0) {
+            count++;
+        }
+    }
+
+    if (count > 0) {
+        temp_s5 = rand_int(count - 1);
+        it = D_802447D4_A3DCB4;
+        count = 0;
+        i = 0;
+
+        for (; i < ARRAY_COUNT(D_802447D4_A3DCB4); i++, it++) {
+            if (temp_s6 >= it->unk_08 &&
+                func_802411BC_A3A69C(it->unk_04) == 0 &&
+                evt_get_variable(NULL, AreaFlag(3 + i)) == 0)
+            {
+                if (count == temp_s5) {
+                    script->varTable[1] = it->unk_00;
+                    evt_set_variable(NULL, AreaFlag(3 + i), 1);
+                    break;
+                }
+                count++;
+            }
+        }
+        return ApiStatus_DONE2;
+    }
+
+    for (i = 0, it = D_802447D4_A3DCB4; i < ARRAY_COUNT(D_802447D4_A3DCB4); i++, it++) {
+        if (it->unk_08 == 0x2712 &&
+            func_802411BC_A3A69C(it->unk_04) == 0 &&
+            evt_get_variable(NULL, AreaFlag(3 + i)) == 0)
+        {
+            count++;
+        }
+    }
+
+    if (count > 0) {
+        temp_s5 = rand_int(count - 1);
+        it = D_802447D4_A3DCB4;
+        count = 0;
+        i = 0;
+
+        for (; i < ARRAY_COUNT(D_802447D4_A3DCB4); i++, it++) {
+            if (it->unk_08 == 0x2712 &&
+                func_802411BC_A3A69C(it->unk_04) == 0 &&
+                evt_get_variable(NULL, AreaFlag(3 + i)) == 0)
+            {
+                if (count == temp_s5) {
+                    script->varTable[1] = it->unk_00;
+                    evt_set_variable(NULL, AreaFlag(3 + i), 1);
+                    break;
+                }
+                count++;
+            }
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_802414E4_A3A9C4(Evt* script, s32 isInitialCall) {
+    s32 temp_s5 = evt_get_variable(NULL, GameByte(0));
+    u32 count = 0;
+    s32 temp_s7;
+    UnkThing* it;
+    u32 i;
+
+    script->varTable[1] = 0;
+
+    it = D_80244B88_A3E068;
+    for (i = 0; i < ARRAY_COUNT(D_80244B88_A3E068); i++, it++) {
+        if (temp_s5 >= it->unk_08 &&
+            evt_get_variable(NULL, it->unk_04) == 0 &&
+            evt_get_variable(NULL, AreaFlag(100 + i)) == 0)
+        {
+            count++;
+        }
+    }
+
+    if (count > 0) {
+        temp_s7 = rand_int(count - 1);
+        it = D_80244B88_A3E068;
+        count = 0;
+
+        for (i = 0; i < ARRAY_COUNT(D_80244B88_A3E068); i++, it++) {
+            if (temp_s5 >= it->unk_08 &&
+                evt_get_variable(NULL, it->unk_04) == 0 &&
+                evt_get_variable(NULL, AreaFlag(100 + i)) == 0)
+            {
+                if (count == temp_s7) {
+                    script->varTable[1] = it->unk_00;
+                    evt_set_variable(NULL, AreaFlag(100 + i), 1);
+                    break;
+                }
+                count++;
+            }
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80241668_A3AB48(Evt* script, s32 isInitialCall) {
+    s32 temp_s5 = evt_get_variable(NULL, GameByte(0));
+    u32 count = 0;
+    s32 temp_s7;
+    UnkThing* it;
+    u32 i;
+
+    script->varTable[1] = 0;
+
+    it = D_80244C48_A3E128;
+    for (i = 0; i < ARRAY_COUNT(D_80244C48_A3E128); i++, it++) {
+        if (temp_s5 >= it->unk_08 &&
+            evt_get_variable(NULL, it->unk_04) == 0 &&
+            evt_get_variable(NULL, AreaFlag(116 + i)) == 0)
+        {
+            count++;
+        }
+    }
+
+    if (count > 0) {
+        temp_s7 = rand_int(count - 1);
+        it = D_80244C48_A3E128;
+        count = 0;
+
+        for (i = 0; i < ARRAY_COUNT(D_80244C48_A3E128); i++, it++) {
+            if (temp_s5 >= it->unk_08 &&
+                evt_get_variable(NULL, it->unk_04) == 0 &&
+                evt_get_variable(NULL, AreaFlag(116 + i)) == 0)
+            {
+                if (count == temp_s7) {
+                    script->varTable[1] = it->unk_00;
+                    evt_set_variable(NULL, AreaFlag(116 + i), 1);
+                    break;
+                }
+                count++;
+            }
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_802417EC_A3ACCC(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 26f05bebd0..cb8d6413db 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -10,7 +10,16 @@
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_80248760_jan_02[];
 
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 301e73ca15..aa623ff12a 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -29,7 +29,16 @@ static char* N(exit_str_4) = "tik_08";
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C_B365FC);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_8024FBA0[];
 
diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c
index 5fa7333c0e..98e8a5c8d4 100644
--- a/src/world/area_kkj/kkj_18/AF2FE0.c
+++ b/src/world/area_kkj/kkj_18/AF2FE0.c
@@ -1,8 +1,8 @@
 #include "kkj_18.h"
 #include "camera.h"
 
-extern s32 D_80241F10_AF4BB0;
-extern s32 D_80241F14_AF4BB4;
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
 extern s32 kkj_18_D_80244E78[];
 
 #include "world/common/todo/GetNpcCollisionHeight.inc.c"
@@ -15,12 +15,12 @@ ApiStatus func_8024056C_AF320C(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_80241F10_AF4BB0 = 0;
+        kkj_18_ItemChoice_HasSelectedItem = 0;
     }
 
-    if (D_80241F10_AF4BB0 != 0) {
-        D_80241F10_AF4BB0 = 0;
-        evt_set_variable(script, *args++, D_80241F14_AF4BB4);
+    if (kkj_18_ItemChoice_HasSelectedItem != 0) {
+        kkj_18_ItemChoice_HasSelectedItem = 0;
+        evt_set_variable(script, *args++, kkj_18_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
 
@@ -30,12 +30,11 @@ ApiStatus func_8024056C_AF320C(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024056C_AF320C);
 #endif
 
-ApiStatus func_802405C0_AF3260(Evt* script, s32 isInitialCall) {
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241F14_AF4BB4 = evt_get_variable(script, *args++);
-    D_80241F10_AF4BB0 = 1;
-
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
+    N(ItemChoice_HasSelectedItem) = TRUE;
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c
index c52d72fdd1..7852b03404 100644
--- a/src/world/area_kkj/kkj_19/AF7C00.c
+++ b/src/world/area_kkj/kkj_19/AF7C00.c
@@ -1,8 +1,8 @@
 #include "kkj_19.h"
 #include "hud_element.h"
 
-extern s32 D_80241B10_AF9460;
-extern s32 D_80241B14_AF9464;
+extern s32 kkj_19_ItemChoice_HasSelectedItem;
+extern s32 kkj_19_ItemChoice_SelectedItemID;
 extern s32 kkj_19_D_802461F0[];
 extern s32 D_802463B8_kkj_19[];
 extern s32 D_8024652C;
@@ -32,12 +32,12 @@ ApiStatus func_802404DC_AF7E2C(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_80241B10_AF9460 = 0;
+        kkj_19_ItemChoice_HasSelectedItem = 0;
     }
 
-    if (D_80241B10_AF9460 != 0) {
-        D_80241B10_AF9460 = 0;
-        evt_set_variable(script, *args++, D_80241B14_AF9464);
+    if (kkj_19_ItemChoice_HasSelectedItem != 0) {
+        kkj_19_ItemChoice_HasSelectedItem = 0;
+        evt_set_variable(script, *args++, kkj_19_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
 
@@ -47,12 +47,11 @@ ApiStatus func_802404DC_AF7E2C(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802404DC_AF7E2C);
 #endif
 
-ApiStatus func_80240530_AF7E80(Evt* script, s32 isInitialCall) {
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241B14_AF9464 = evt_get_variable(script, *args++);
-    D_80241B10_AF9460 = 1;
-
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
+    N(ItemChoice_HasSelectedItem) = TRUE;
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c
index acab4c1906..0004475899 100644
--- a/src/world/area_kmr/kmr_02/8B0070.c
+++ b/src/world/area_kmr/kmr_02/8B0070.c
@@ -47,7 +47,16 @@ ApiStatus func_80242014_8B2084(Evt* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 kmr_02_D_80257F58[];
 
diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c
index 44686bcb71..331d745b7c 100644
--- a/src/world/area_kpa/kpa_81/A78510.c
+++ b/src/world/area_kpa/kpa_81/A78510.c
@@ -4,8 +4,8 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-extern s32 D_80240D98_A79258;
-extern s32 D_80240D9C_A7925C;
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
 
 // Needs data migrated
 #ifdef NON_MATCHING
@@ -13,11 +13,11 @@ ApiStatus func_8024027C_A7873C(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     
     if (isInitialCall) {
-        D_80240D98_A79258 = 0;
+        kpa_81_ItemChoice_HasSelectedItem = 0;
     }
-    if (D_80240D98_A79258 != 0) {
-        D_80240D98_A79258 = 0;
-        evt_set_variable(script, *args++, D_80240D9C_A7925C);
+    if (kpa_81_ItemChoice_HasSelectedItem != 0) {
+        kpa_81_ItemChoice_HasSelectedItem = 0;
+        evt_set_variable(script, *args++, kpa_81_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
     
@@ -32,12 +32,19 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C);
 ApiStatus func_802402D0_A78790(Evt* script, s32 isInitialCall) { 
     Bytecode* args = script->ptrReadPos;
     
-    D_80240D9C_A7925C = evt_get_variable(script, *args++);
-    D_80240D98_A79258 = 1;
+    kpa_81_ItemChoice_SelectedItemID = evt_get_variable(script, *args++);
+    kpa_81_ItemChoice_HasSelectedItem = 1;
     return ApiStatus_DONE2;
 }
 #else
-INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 #endif
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8);
diff --git a/src/world/area_kpa/kpa_82/A7A550.c b/src/world/area_kpa/kpa_82/A7A550.c
index 56a37a7fc7..a6d4f70408 100644
--- a/src/world/area_kpa/kpa_82/A7A550.c
+++ b/src/world/area_kpa/kpa_82/A7A550.c
@@ -6,14 +6,14 @@
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_8024027C_A7A77C);
 
-extern s32 D_80240C20_A7B120;
-extern s32 D_80240C24_A7B124;
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
 
-ApiStatus func_802402D0_A7A7D0(Evt* script, s32 isInitialCall) {
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80240C24_A7B124 = evt_get_variable(script, *args++);
-    D_80240C20_A7B120 = 1;
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
+    N(ItemChoice_HasSelectedItem) = TRUE;
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c
index 5933f872d1..2bce104f9a 100644
--- a/src/world/area_mac/mac_00/7EB340.c
+++ b/src/world/area_mac/mac_00/7EB340.c
@@ -17,7 +17,16 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 mac_00_D_80255BA0[];
 
diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c
index a7ef9825bb..aba1c8109c 100644
--- a/src/world/area_mac/mac_00/7ED280.c
+++ b/src/world/area_mac/mac_00/7ED280.c
@@ -22,7 +22,18 @@ static char* N(exit_str_0) = "mac_01";
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8);
+#define NAMESPACE dup_mac_00
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
+#define NAMESPACE mac_00
 
 extern s32 D_80255EE0[];
 
diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c
index 355aede6a5..1c58b3086b 100644
--- a/src/world/area_mac/mac_01/8017D0.c
+++ b/src/world/area_mac/mac_01/8017D0.c
@@ -3,8 +3,8 @@
 
 #define CHUCK_QUIZMO_NPC_ID 5
 
-extern s32 D_8024D944_80E1C4;
-extern s32 D_8024D948_80E1C8;
+extern s32 mac_01_ItemChoice_HasSelectedItem;
+extern s32 mac_01_ItemChoice_SelectedItemID;
 extern s32 D_80258404_818C84;
 extern s32 D_80262F68;
 
@@ -68,11 +68,11 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4_804554);
 
-ApiStatus func_80243D28_8045A8(Evt* script, s32 isInitialCall) {
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_8024D948_80E1C8 = evt_get_variable(script, *args++);
-    D_8024D944_80E1C4 = 1;
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
+    N(ItemChoice_HasSelectedItem) = TRUE;
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c
index 226d2350d7..ac9398e563 100644
--- a/src/world/area_mac/mac_02/823BF0.c
+++ b/src/world/area_mac/mac_02/823BF0.c
@@ -9,8 +9,8 @@ extern s32 N(Quizmo_AnswerResult);
 extern EffectInstance* N(Quizmo_StageEffect);
 extern EffectInstance* N(Quizmo_AudienceEffect);
 extern EffectInstance* N(Quizmo_VannaTEffect);
-extern s32 D_80248778_82BA38;
-extern s32 D_8024877C_82BA3C;
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
 extern s32 D_8024EA10;
 extern s32 D_8024EA14;
 
@@ -22,16 +22,16 @@ extern s32 D_8024EA14;
 
 // needs data migration, matching otherwise
 #ifdef NON_MATCHING
-s32 D_8024877C_82BA3C = 0;
+s32 mac_02_ItemChoice_SelectedItemID = 0;
 
 ApiStatus func_80242A80_825D40(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     if (isInitialCall) {
-        D_80248778_82BA38 = 0;
+        mac_02_ItemChoice_HasSelectedItem = 0;
     }
-    if (D_80248778_82BA38 != 0) {
-        D_80248778_82BA38 = 0;
-        evt_set_variable(script, args[0], D_8024877C_82BA3C);
+    if (mac_02_ItemChoice_HasSelectedItem != 0) {
+        mac_02_ItemChoice_HasSelectedItem = 0;
+        evt_set_variable(script, args[0], mac_02_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
     return ApiStatus_BLOCK;
@@ -40,7 +40,13 @@ ApiStatus func_80242A80_825D40(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40);
 #endif
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4_825D94);
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 mac_02_D_8024E570[];
 
diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c
index 623bcde0d9..760ce8ed55 100644
--- a/src/world/area_mac/mac_03/831B20.c
+++ b/src/world/area_mac/mac_03/831B20.c
@@ -19,7 +19,16 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 mac_03_D_80251400[];
 
diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c
index 2e28a7ecb6..a3e2eecd5a 100644
--- a/src/world/area_mac/mac_04/843030.c
+++ b/src/world/area_mac/mac_04/843030.c
@@ -17,7 +17,16 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 mac_04_D_8024F5D0[];
 
diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c
index 0ca0f0bcd4..ef3a203ae8 100644
--- a/src/world/area_mac/mac_05/852170.c
+++ b/src/world/area_mac/mac_05/852170.c
@@ -33,7 +33,16 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634_8547A4);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 mac_05_D_80252A00[];
 
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index f11cbc5778..1cfb233819 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -1,8 +1,8 @@
 #include "nok_01.h"
 #include "effects.h"
 
-extern s32 D_8024856C_9CD94C;
-extern s32 D_80248570_9CD950;
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
 
 static char* N(exit_str_0) = "nok_13";
 static char* N(exit_str_1) = "nok_02";
@@ -31,12 +31,12 @@ ApiStatus func_80242028_9C7408(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_8024856C_9CD94C = FALSE;
+        nok_01_ItemChoice_HasSelectedItem = FALSE;
     }
 
-    if (D_8024856C_9CD94C) {
-        D_8024856C_9CD94C = FALSE;
-        evt_set_variable(script, *args++, D_80248570_9CD950);
+    if (nok_01_ItemChoice_HasSelectedItem) {
+        nok_01_ItemChoice_HasSelectedItem = FALSE;
+        evt_set_variable(script, *args++, nok_01_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
     return ApiStatus_BLOCK;
@@ -45,7 +45,13 @@ ApiStatus func_80242028_9C7408(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408);
 #endif
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C);
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 nok_01_D_80251C70[];
 
diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c
index 8ed4d950a0..167d386f57 100644
--- a/src/world/area_nok/nok_02/9D7020.c
+++ b/src/world/area_nok/nok_02/9D7020.c
@@ -16,7 +16,16 @@ static char* N(exit_str_3) = "";
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678_9D7698);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 nok_02_D_802547D0[];
 
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index 6838e270e6..52995dba5b 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -21,7 +21,18 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44);
+#define NAMESPACE dup_nok_02
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
+#define NAMESPACE nok_02
 
 extern s32 nok_02_D_802549D0[];
 
diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c
index 548d15f9af..f323239018 100644
--- a/src/world/area_nok/nok_02/9DA8F0.c
+++ b/src/world/area_nok/nok_02/9DA8F0.c
@@ -31,15 +31,22 @@ ApiStatus func_802438D0_9DA8F0(Evt* script, s32 isInitialCall) {
 
 #define NAMESPACE dup2_nok_02
 #include "world/common/todo/GetNpcCollisionHeight.inc.c"
-#define NAMESPACE nok_02
 
-#define NAMESPACE dup2_nok_02
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
-#define NAMESPACE nok_02
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40_9DAC60);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
+#define NAMESPACE nok_02
 
 extern s32 nok_02_D_80254BA0[];
 
diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c
index 4086023674..38e61da584 100644
--- a/src/world/area_obk/obk_01/BBD980.c
+++ b/src/world/area_obk/obk_01/BBD980.c
@@ -10,7 +10,16 @@
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24_BBDCC4);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240BB0_BBDD50);
 
diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c
index fe6b7568fa..b7153362fd 100644
--- a/src/world/area_obk/obk_03/BC43F0.c
+++ b/src/world/area_obk/obk_03/BC43F0.c
@@ -10,7 +10,16 @@
 
 INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4_BC4734);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_80243BE0[];
 
diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c
index 3e97583a1f..a1aefe72f2 100644
--- a/src/world/area_omo/omo_05/DB22C0.c
+++ b/src/world/area_omo/omo_05/DB22C0.c
@@ -15,7 +15,16 @@ static char* N(exit_str_1) = "";
 
 INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802421CC_DB448C);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_80245650[];
 
diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c
index a267590762..c50a6da12f 100644
--- a/src/world/area_omo/omo_13/DE2710.c
+++ b/src/world/area_omo/omo_13/DE2710.c
@@ -14,12 +14,12 @@ ApiStatus func_80240F00_DE3390(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_80241C04_DE4094 = FALSE;
+        omo_13_ItemChoice_HasSelectedItem = FALSE;
     }
 
-    if (D_80241C04_DE4094) {
-        D_80241C04_DE4094 = FALSE;
-        evt_set_variable(script, *args++, D_80241C08_DE4098);
+    if (omo_13_ItemChoice_HasSelectedItem) {
+        omo_13_ItemChoice_HasSelectedItem = FALSE;
+        evt_set_variable(script, *args++, omo_13_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
 
@@ -29,7 +29,16 @@ ApiStatus func_80240F00_DE3390(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390);
 #endif
 
-INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F54_DE33E4);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 omo_13_80243220[];
 
diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c
index a3efe1a869..161978e110 100644
--- a/src/world/area_osr/osr_01/AB0350.c
+++ b/src/world/area_osr/osr_01/AB0350.c
@@ -8,8 +8,8 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-extern s32 D_8024121C_AB120C;
-extern s32 D_80241220_AB1210;
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
 
 // Needs data migrated
 #ifdef NON_MATCHING
@@ -17,12 +17,12 @@ ApiStatus func_802406A4_AB0694(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_8024121C_AB120C = 0;
+        osr_01_ItemChoice_HasSelectedItem = 0;
     }
 
-    if (D_8024121C_AB120C != 0) {
-        D_8024121C_AB120C = 0;
-        evt_set_variable(script, *args++, D_80241220_AB1210);
+    if (osr_01_ItemChoice_HasSelectedItem != 0) {
+        osr_01_ItemChoice_HasSelectedItem = 0;
+        evt_set_variable(script, *args++, osr_01_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
 
@@ -37,12 +37,19 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406A4_AB0694);
 ApiStatus func_802406F8_AB06E8(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241220_AB1210 = evt_get_variable(script, *args++);
-    D_8024121C_AB120C = 1;
+    osr_01_ItemChoice_SelectedItemID = evt_get_variable(script, *args++);
+    osr_01_ItemChoice_HasSelectedItem = 1;
     return ApiStatus_DONE2;
 }
 #else
-INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 #endif
 
 INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720);
diff --git a/src/world/area_osr/osr_03/AB62B0.c b/src/world/area_osr/osr_03/AB62B0.c
index 311ed6e381..6f5ae9fe73 100644
--- a/src/world/area_osr/osr_03/AB62B0.c
+++ b/src/world/area_osr/osr_03/AB62B0.c
@@ -3,7 +3,7 @@
 ApiStatus func_80240020_AB62B0(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     
-    evt_set_variable(script, *args, sin_deg(evt_get_variable(script, *args)) * 20.0f);
+    evt_set_variable(script, *args++, sin_deg(evt_get_variable(script, *args)) * 20.0f);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/area_osr/osr_04/AB92B0.c b/src/world/area_osr/osr_04/AB92B0.c
index ae95eb79ea..a2deb79c91 100644
--- a/src/world/area_osr/osr_04/AB92B0.c
+++ b/src/world/area_osr/osr_04/AB92B0.c
@@ -12,6 +12,6 @@ const char* N(exit_str_0) = "kkj_03";
 ApiStatus func_80240050_AB9300(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     
-    evt_set_variable(script, *args, (sin_deg(evt_get_variable(script, *args)) * 20.0f));
+    evt_set_variable(script, *args++, (sin_deg(evt_get_variable(script, *args)) * 20.0f));
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c
index 6810e1a359..b01af64886 100644
--- a/src/world/area_pra/pra_01/D4D060.c
+++ b/src/world/area_pra/pra_01/D4D060.c
@@ -15,7 +15,16 @@ ApiStatus func_80240F60_D4DFA0(Evt* script, s32 isInitialCall) {
 
 INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241200_D4E240);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_80242FB0[];
 
diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c
index 62b6b221d0..13dfe58461 100644
--- a/src/world/area_pra/pra_02/D50010.c
+++ b/src/world/area_pra/pra_02/D50010.c
@@ -8,7 +8,16 @@
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_8024114C_D5113C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411A0_D51190);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8);
 
diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c
index 150cb93345..a385e1a0e9 100644
--- a/src/world/area_pra/pra_09/D588B0.c
+++ b/src/world/area_pra/pra_09/D588B0.c
@@ -9,7 +9,16 @@
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411A0_D59A30);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 flo_18_shakeTree[];
 
diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c
index c86e57edf0..1ce11c78c6 100644
--- a/src/world/area_pra/pra_13/D64600.c
+++ b/src/world/area_pra/pra_13/D64600.c
@@ -8,7 +8,16 @@
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411A0_D65780);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_80243720[];
 
diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c
index e606e829ec..749b456af5 100644
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ b/src/world/area_pra/pra_19/D6E9D0.c
@@ -8,7 +8,16 @@
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411A0_D6FB50);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_802479F0[];
 
diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c
index 09fd5da1c4..08d4362f75 100644
--- a/src/world/area_pra/pra_31/D7ED80.c
+++ b/src/world/area_pra/pra_31/D7ED80.c
@@ -6,7 +6,16 @@
 
 INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402A0_D7F000);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_80247CA0[];
 
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index 62c224b529..41c6ba38de 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -9,7 +9,16 @@
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240590_CF8100);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_8024DBC0[];
 
diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c
index 8b0bb53cb4..a2a55b283a 100644
--- a/src/world/area_sam/sam_04/D138E0.c
+++ b/src/world/area_sam/sam_04/D138E0.c
@@ -6,7 +6,16 @@
 
 INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240590_D13B60);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 sam_04_80245210[];
 
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index a480ea5b03..e37b7d31a9 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -12,7 +12,16 @@
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241DE0_D21C70);
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 extern s32 D_8024BEA0[];
 
diff --git a/src/world/area_trd/trd_03/trd_03_1_main.c b/src/world/area_trd/trd_03/trd_03_1_main.c
index d57fcb55f8..0ad07b30e2 100644
--- a/src/world/area_trd/trd_03/trd_03_1_main.c
+++ b/src/world/area_trd/trd_03/trd_03_1_main.c
@@ -18,7 +18,7 @@ API_CALLABLE(N(GetHiddenDoorPushDirection)) {
         pushDir = 2;
     }
 
-    evt_set_variable(script, *args, pushDir);
+    evt_set_variable(script, *args++, pushDir);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/common/atomic/ItemChoice_PartA.inc.c b/src/world/common/atomic/ItemChoice_PartA.inc.c
index fded06761b..3738a0322c 100644
--- a/src/world/common/atomic/ItemChoice_PartA.inc.c
+++ b/src/world/common/atomic/ItemChoice_PartA.inc.c
@@ -13,7 +13,7 @@ ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) {
 
     if (N(ItemChoice_HasSelectedItem)) {
         N(ItemChoice_HasSelectedItem) = FALSE;
-        evt_set_variable(script, *args, N(ItemChoice_SelectedItemID));
+        evt_set_variable(script, *args++, N(ItemChoice_SelectedItemID));
         return ApiStatus_DONE2;
     }
 
diff --git a/src/world/common/complete/KeyItemChoice.inc.c b/src/world/common/complete/KeyItemChoice.inc.c
index b7eeab0913..60c057836d 100644
--- a/src/world/common/complete/KeyItemChoice.inc.c
+++ b/src/world/common/complete/KeyItemChoice.inc.c
@@ -23,7 +23,7 @@ ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) {
 
     if (N(ItemChoice_HasSelectedItem)) {
         N(ItemChoice_HasSelectedItem) = FALSE;
-        evt_set_variable(script, *args, N(ItemChoice_SelectedItemID));
+        evt_set_variable(script, *args++, N(ItemChoice_SelectedItemID));
         return ApiStatus_DONE2;
     }
 
diff --git a/src/world/common/complete/NormalItemChoice.inc.c b/src/world/common/complete/NormalItemChoice.inc.c
index 1606be48d4..a16a9a9671 100644
--- a/src/world/common/complete/NormalItemChoice.inc.c
+++ b/src/world/common/complete/NormalItemChoice.inc.c
@@ -23,7 +23,7 @@ API_CALLABLE(N(ItemChoice_WaitForSelection)) {
 
     if (N(ItemChoice_HasSelectedItem)) {
         N(ItemChoice_HasSelectedItem) = FALSE;
-        evt_set_variable(script, *args, N(ItemChoice_SelectedItemID));
+        evt_set_variable(script, *args++, N(ItemChoice_SelectedItemID));
         return ApiStatus_DONE2;
     }
 
diff --git a/src/world/common/todo/UnkFunc52.inc.c b/src/world/common/todo/UnkFunc52.inc.c
index e04244eb89..f2393d7c87 100644
--- a/src/world/common/todo/UnkFunc52.inc.c
+++ b/src/world/common/todo/UnkFunc52.inc.c
@@ -38,16 +38,16 @@ ApiStatus N(UnkFunc52)(Evt* script, s32 isInitialCall) {
         case ACTOR_TYPE_UNUSED_62:
         case ACTOR_TYPE_UNUSED_63:
         case ACTOR_TYPE_UNUSED_64:
-            evt_set_variable(script, *args, -1);
+            evt_set_variable(script, *args++, -1);
             break;
 
         case ACTOR_TYPE_DRY_BONES:
             if (actor->state.varTable[8] == 1) {
-                evt_set_variable(script, *args, -1);
+                evt_set_variable(script, *args++, -1);
                 break;
             }
         default:
-            evt_set_variable(script, *args, 0);
+            evt_set_variable(script, *args++, 0);
     }
 
     return ApiStatus_DONE2;
diff --git a/src/world/dead/dead_03/EB1170.c b/src/world/dead/dead_03/EB1170.c
index 0e6ee75b08..c5c453abad 100644
--- a/src/world/dead/dead_03/EB1170.c
+++ b/src/world/dead/dead_03/EB1170.c
@@ -1,8 +1,8 @@
 #include "dead_03.h"
 
 extern s32 func_80059AC8(s32, s32);
-extern s32 D_802417E4_EB2644;
-extern s32 D_802417E8_EB2648;
+extern s32 dead_03_ItemChoice_HasSelectedItem;
+extern s32 dead_03_ItemChoice_SelectedItemID;
 extern s32 dead_03_D_802442D0[];
 extern s32 dead_03_LetterDelivery_SavedNpcAnim;
 extern s32 D_800B8DEC;
@@ -21,11 +21,11 @@ ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_802417E4_EB2644 = 0;
+        dead_03_ItemChoice_HasSelectedItem = 0;
     }
-    if (D_802417E4_EB2644 != 0) {
-        D_802417E4_EB2644 = 0;
-        dead_evt_set_variable(script, *args++, D_802417E8_EB2648);
+    if (dead_03_ItemChoice_HasSelectedItem != 0) {
+        dead_03_ItemChoice_HasSelectedItem = 0;
+        dead_evt_set_variable(script, *args++, dead_03_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
     return ApiStatus_BLOCK;
@@ -34,11 +34,11 @@ ApiStatus func_80240654_EB14B4(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "EB1170", func_80240654_EB14B4);
 #endif
 
-ApiStatus func_802406A8_EB1508(Evt* script, s32 isInitialCall) {
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_802417E8_EB2648 = evt_get_variable(script, *args++);
-    D_802417E4_EB2644 = 1;
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args);
+    N(ItemChoice_HasSelectedItem) = TRUE;
     return ApiStatus_DONE2;
 }
 
diff --git a/src/world/dead/flo_12/EDC020.c b/src/world/dead/flo_12/EDC020.c
index a60c79dd9e..6ded6c0f77 100644
--- a/src/world/dead/flo_12/EDC020.c
+++ b/src/world/dead/flo_12/EDC020.c
@@ -17,12 +17,12 @@ ApiStatus func_802405C0_EDC5A0(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_80241850_EDD830 = FALSE;
+        dead_flo_12_ItemChoice_HasSelectedItem = FALSE;
     }
 
-    if (D_80241850_EDD830) {
-        D_80241850_EDD830 = FALSE;
-        evt_set_variable(script, *args, D_80241850_EDD834);
+    if (dead_flo_12_ItemChoice_HasSelectedItem) {
+        dead_flo_12_ItemChoice_HasSelectedItem = FALSE;
+        evt_set_variable(script, *args++, D_80241850_EDD834);
         return ApiStatus_DONE2;
     }
 
@@ -32,17 +32,16 @@ ApiStatus func_802405C0_EDC5A0(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "EDC020", func_802405C0_EDC5A0);
 #endif
 
-#ifdef NON_MATCHING // TODO(data)
-ApiStatus func_80240614_EDC5F4(Evt* script, s32 isInitialCall) {
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_80241850_EDD834 = evt_get_variable(script, *args);
-    D_80241850_EDD830 = TRUE;
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
     return ApiStatus_DONE2;
 }
-#else
-INCLUDE_ASM(s32, "EDC020", func_80240614_EDC5F4);
-#endif
 
 ApiStatus func_8024064C_EDC62C(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/dead/kzn_17/EA0C10.c b/src/world/dead/kzn_17/EA0C10.c
index ab2c81ff21..62d6042ba4 100644
--- a/src/world/dead/kzn_17/EA0C10.c
+++ b/src/world/dead/kzn_17/EA0C10.c
@@ -34,12 +34,12 @@ ApiStatus func_802429C0_EA32C0(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_802441B8_EA4AB8 = FALSE;
+        dead_kzn_17_ItemChoice_HasSelectedItem = FALSE;
     }
 
-    if (D_802441B8_EA4AB8) {
-        D_802441B8_EA4AB8 = FALSE;
-        evt_set_variable(script, *args++, D_802441BC_EA4ABC);
+    if (dead_kzn_17_ItemChoice_HasSelectedItem) {
+        dead_kzn_17_ItemChoice_HasSelectedItem = FALSE;
+        evt_set_variable(script, *args++, dead_kzn_17_ItemChoice_SelectedItemID);
         return ApiStatus_DONE2;
     }
 
@@ -49,19 +49,16 @@ ApiStatus func_802429C0_EA32C0(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "EA0C10", func_802429C0_EA32C0);
 #endif
 
-// Requires data migration
-#ifdef NON_MATCHING
-ApiStatus func_80242A14_EA3314(Evt* script, s32 isInitialCall) {
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
-    D_802441BC_EA4ABC = dead_evt_get_variable(script, *args++);
-    D_802441B8_EA4AB8 = TRUE;
-
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
     return ApiStatus_DONE2;
 }
-#else
-INCLUDE_ASM(s32, "EA0C10", func_80242A14_EA3314);
-#endif
 
 ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/dead/kzn_19/EA8AE0.c b/src/world/dead/kzn_19/EA8AE0.c
index e9c1944768..46a904ccc4 100644
--- a/src/world/dead/kzn_19/EA8AE0.c
+++ b/src/world/dead/kzn_19/EA8AE0.c
@@ -2,8 +2,8 @@
 
 extern Gfx D_80243AD8_EAC5B8[];
 extern s32 D_80243BB8_EAC698[];
-extern s32 D_80243DD8_EAC8B8;
-extern s32 D_80243DDC_EAC8BC;
+extern s32 dead_kzn_19_ItemChoice_HasSelectedItem;
+extern s32 dead_kzn_19_ItemChoice_SelectedItemID;
 extern s32 D_80248380;
 extern s32 N(D_80248388)[];
 
@@ -297,12 +297,12 @@ ApiStatus func_802417AC_EAA28C(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        D_80243DD8_EAC8B8 = FALSE;
+        dead_kzn_19_ItemChoice_HasSelectedItem = FALSE;
     }
-    if (D_80243DD8_EAC8B8) {
-        D_80243DD8_EAC8B8 = FALSE;
+    if (dead_kzn_19_ItemChoice_HasSelectedItem) {
+        dead_kzn_19_ItemChoice_HasSelectedItem = FALSE;
 
-        evt_set_variable(script, *args++, D_80243DDC_EAC8BC);
+        evt_set_variable(script, *args++, dead_kzn_19_ItemChoice_SelectedItemID);
 
         return ApiStatus_DONE2;
     }
@@ -313,7 +313,13 @@ ApiStatus func_802417AC_EAA28C(Evt* script, s32 isInitialCall) {
 INCLUDE_ASM(s32, "EA8AE0", func_802417AC_EAA28C);
 #endif
 
-INCLUDE_ASM(s32, "EA8AE0", func_80241800_EAA2E0);
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
 
 ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/tools/substitute.py b/tools/substitute.py
index 6221f0d889..7f38d9680b 100755
--- a/tools/substitute.py
+++ b/tools/substitute.py
@@ -21,10 +21,21 @@ from_funcs = []
 with open(args.from_list) as f:
     from_text = f.readlines()
 
-to_line = from_text[0].strip()
-func_name = to_line[to_line.rfind("/") + 1:to_line.find(".")]
+to_line = """
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
 
-for from_line in from_text[1:]:
+ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++);
+    N(ItemChoice_HasSelectedItem) = TRUE;
+    return ApiStatus_DONE2;
+}
+"""
+func_name = "ItemChoice_SaveSelected"
+
+for from_line in from_text:
     if len(from_line.strip()) > 0:
         from_funcs.append(from_line.rstrip().split(" ")[-1])
 
@@ -38,7 +49,7 @@ for root, dirs, files in os.walk(src_dir):
             f_text = f_text_orig
             for func in from_funcs:
                 search_pattern = re.compile("\n.*" + func + "\).*\n")
-                f_text = re.sub(search_pattern, "\n" + to_line + "\n", f_text)
+                f_text = re.sub(search_pattern, to_line, f_text)
             if f_text != f_text_orig:
                 with open(f_path, "w", newline="\n") as f:
                     f.write(f_text)
@@ -46,6 +57,8 @@ for root, dirs, files in os.walk(src_dir):
 # # Rename symbols in from_funcs to namespace equivalents
 # for root, dirs, files in os.walk
 
+to_replace = []                    
+
 for root, dirs, files in os.walk(asm_dir):
     for f_name in files:
         if f_name.endswith(".s"):
@@ -55,18 +68,26 @@ for root, dirs, files in os.walk(asm_dir):
 
             f_text = f_text_orig
 
-            if Path(f_path).parent.parent.name == "nonmatchings":
-                namespace = Path(f_path).parent.name
-            else:
-                namespace = Path(f_path).parent.parent.name
+            namespace = Path(f_path).parent.name
+            non_matching = "nonmatchings" in str(Path(f_path))
 
-            # TODO refactor into new func
-            # if f_name[:-2] in from_funcs:
-            #     syms = list(set(re.findall(r"D_[0-9A-F]{8}_[0-9A-F]{6}", f_text)))
-            #     print(f"{syms[0]} {namespace}_varTable")
+            if non_matching:
+                namespace = Path(f_path).parent.name
+                if "world" not in str(Path(f_path)):
+                    namespace = Path(f_path).parent.name
+
+            namespace = "dead_" + namespace
 
             for func in from_funcs:
                 f_text = f_text.replace(func, namespace + "_" + func_name)
             if f_text != f_text_orig:
+                if non_matching:
+                    syms = sorted(set(re.findall(r"D_[0-9A-F]{8}_[0-9A-F]{6}", f_text)))
+                    to_replace.append(syms[0] + " " + namespace + "_ItemChoice_HasSelectedItem\n")
+                    to_replace.append(syms[1] + " " + namespace + "_ItemChoice_SelectedItemID\n")
+
                 with open(f_path, "w", newline="\n") as f:
                     f.write(f_text)
+
+with open("to_rename.txt", "w") as f:
+    f.writelines(to_replace)
diff --git a/ver/us/asm/data/world/area_hos/hos_05/A30810.data.s b/ver/us/asm/data/world/area_hos/hos_05/A30810.data.s
index 86dee4736b..5413b2fe09 100644
--- a/ver/us/asm/data/world/area_hos/hos_05/A30810.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_05/A30810.data.s
@@ -294,4 +294,4 @@ dlabel D_8024AEC8_A35108
 .word 0x00000000
 
 dlabel D_8024AECC_A3510C
-.word 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x0000000A, 0x00000002, 0x00000043, 0x00000006, SetNpcPaletteSwapLower, 0x0000000A, 0x00000000, 0x00000001, 0x00000014, 0x00000005, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000002, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000004, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000005, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000006, 0x00000002, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000000, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000001, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000002, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000003, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000004, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000005, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000006, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00040000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00800017, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00800021, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000007, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000008, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000009, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802444E8_A2E728, 0x00000057, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00800019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00800021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600017, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000002D, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF6F, 0x00000093, 0x00000054, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000082, 0x00000082, 0x00000082, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6F, 0x00000093, 0x00000054, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_802496EC_A3392C, 0x00000043, 0x00000001, func_802440D0_A2E310, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000007, func_802CFD30, 0x00000007, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFFFFFFC0, 0x00000087, 0x00000055, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFFFFFFC0, 0x00000087, 0x00000055, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000032, 0x00000027, 0x00000002, 0xFE363C80, 0x00000006, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000013, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000007, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000036, 0x00000001, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD491, 0xFE363C8F, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80244454_A2E694, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000010, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80244934_A2EB74, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x000000A5, 0x00000060, 0x00000098, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003CF, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000040, 0x00000022, 0x0000003A, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, func_802CFD30, 0x00000007, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C80, 0x00000046, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000013, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000007, 0x00000008, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x000000FF, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000008, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x000000FF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD491, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0013000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00180008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x0060000E, 0x00000043, 0x0000000F, PlayEffect, 0x00000034, 0x00000002, 0x00000000, 0x000000B4, 0x00000000, 0xF24A84E0, 0xF4ACD48F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000035, 0x00000001, 0x00000000, 0x000000C8, 0x00000000, 0xF24A7E80, 0xF4ACD490, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241B40_A2BD80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241F54_A2C194, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000028, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x0000009D, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249718_A33958, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0018000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000036, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD491, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000078, 0x00000024, 0x00000002, 0xFE363C81, 0x0000037F, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF4, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000000FF, 0x000000FF, 0x000000FF, 0xFE363C81, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x000000A5, 0x00000060, 0x00000098, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003CF, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000069, 0x0000003C, 0x00000066, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003CF, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000040, 0x00000022, 0x0000003A, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000022, 0x0000000E, 0x0000001C, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD491, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000019, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDA, 0x000000D2, 0x00000055, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249744_A33984, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001C, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFFFFFFE2, 0x00000096, 0x000000A2, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFFFFFFE2, 0x00000096, 0x000000A2, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600011, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000017, 0x0000000A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000066, 0x0000002D, 0x00000000, 0x00000072, 0x00000000, 0x00000000, 0x00000003, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000066, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000D, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x000000B4, 0x000000B4, 0x000000B4, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000003E3, 0x00000005, 0x00000001, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000036B, 0x00000005, 0x00000001, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000000, 0x00000000, 0xFE363C80, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFE4, 0x00000024, 0x00000002, 0xFE363C81, 0x000000D2, 0x00000024, 0x00000002, 0xFE363C82, 0x0000009B, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE4, 0x00000024, 0x00000002, 0xFE363C84, 0x000000D1, 0x00000024, 0x00000002, 0xFE363C85, 0x00000099, 0x00000043, 0x00000001, update_heroes_start_turn_A2C264, 0x00000043, 0x0000000F, PlayEffect, 0x00000037, 0x00000000, 0xFFFFFFE2, 0x000000D2, 0x0000008E, 0x00000000, 0x000000B4, 0x00000000, 0x00000005, 0x00000002, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001D, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802421E0_A2C420, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0x00000000, 0x000000B4, 0x00000000, 0xF24A7D50, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, RemoveEffect, 0xF4ACD48F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000019, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDA, 0x000000D2, 0x00000055, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249770_A339B0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001A, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802422A0_A2C4E0, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF10, 0x000000C8, 0x00000071, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_8024979C_A339DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, D_8024A9D0_A34C10, 0x00000005, 0x00000001, 0x0000000A, 0x00000038, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000009, 0x00000030, 0x00000001, D_8024A9D0_A34C10, 0x00000005, 0x00000001, 0x0000000A, 0x00000038, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E1A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E1A, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000001E, 0x000000E8, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_802497C8_A33A08, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x00000000, 0x000000AA, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000000, 0x000000AA, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000014, 0x00000014, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0x00000104, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFEB, 0x00000043, 0x00000001, func_80240FE0_A2B220, 0x00000008, 0x00000001, 0x00000023, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000000FF, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000005C, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x0000006A, 0x0000005E, 0x0000006E, 0x000000D8, 0x000000C3, 0x00000083, 0x00000008, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000064, 0x00000069, 0x0000006B, 0x0000009F, 0x00000076, 0x00000032, 0x00000014, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x0000007A, 0x000000B4, 0x0000006E, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000080, 0x00000080, 0x00000080, 0x000000FF, 0x000000FF, 0x000000C8, 0x0000003C, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802423D4_A2C614, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000B1, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_802497F4_A33A34, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001F, 0x00000043, 0x0000000F, PlayEffect, 0x00000035, 0x00000002, 0x00000014, 0x00000109, 0xFFFFFFEB, 0xF24A7E80, 0xF4ACD492, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000003C, 0x00000002, 0x00000014, 0x00000109, 0xFFFFFFEB, 0xF24A7E80, 0xF4ACD493, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000078, 0x00000024, 0x00000002, 0xFE363C81, 0x0000037F, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFA, 0x00000027, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000000FF, 0x000000FF, 0x000000FF, 0xFE363C81, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000028, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x0000009D, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249718_A33958, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00180008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD492, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD493, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000039, 0x00000000, 0x00000012, 0x00000100, 0xFFFFFFEB, 0xF24A7C20, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000078, 0x00000026, 0x00000002, 0xFE363C81, 0x0000037F, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A8480, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000000FF, 0x000000FF, 0x000000FF, 0xFE363C81, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000046, 0x000000C8, 0xFFFFFF11, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_802496C0_A33900, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0013000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0018000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD481, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD482, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD483, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD484, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD485, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD486, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD487, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x0000006E, 0x0000006E, 0x0000006E, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x000000E6, 0x000000E6, 0x000000E6, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000002, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000003, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000005, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000006, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000007D, 0x00000002, 0xFFFFFF7E, 0x000000DC, 0x00000082, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C82, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A0280, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000044, 0x00000001, D_80249AA8_A33CE8, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD481, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000004, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000010, 0x00000010, 0x00000002, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD488, 0xFE363C8F, 0x00000043, 0x00000004, func_802428C8_A2CB08, 0x00000001, 0x0000001E, 0xF24A7C80, 0x00000043, 0x00000005, LoadPath, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, func_80240E50_A2B090, 0xF4ACD488, 0xF4ACD493, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7A60, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xFE363C84, 0xFE363C84, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240F30_A2B170, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120004, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000001, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD488, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000028, 0x000000C8, 0xFFFFFFD8, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249820_A33A60, 0x00000043, 0x00000002, RemoveEffect, 0xF4ACD490, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00800018, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000007, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600012, 0x00000044, 0x00000001, D_80249B48_A33D88, 0x00000043, 0x00000001, func_802425A0_A2C7E0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600009, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600012, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x0060000D, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600009, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242704_A2C944, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249878_A33AB8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242F74_A2D1B4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80244550_A2E790, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x0060000B, 0x00000043, 0x00000001, func_8024301C_A2D25C, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x0060000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600011, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000006, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00800017, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80244774_A2E9B4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_8024486C_A2EAAC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_80240DF8_A2B038, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x0000000A, 0x00000002, 0x00000043, 0x00000006, SetNpcPaletteSwapLower, 0x0000000A, 0x00000000, 0x00000001, 0x00000014, 0x00000005, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000002, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000004, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000005, 0x00000002, 0x00000043, 0x00000003, SetNpcPaletteSwapMode, 0x00000006, 0x00000002, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000000, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000001, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000002, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000003, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000004, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000005, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, SetNpcPaletteSwapping, 0x00000006, 0x00000000, 0x00000001, 0x00000019, 0x0000000C, 0x00000004, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00040000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00800017, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00800021, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000007, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000008, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000009, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802444E8_A2E728, 0x00000057, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00800019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00800021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600017, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000002D, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF6F, 0x00000093, 0x00000054, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000082, 0x00000082, 0x00000082, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF6F, 0x00000093, 0x00000054, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_802496EC_A3392C, 0x00000043, 0x00000001, func_802440D0_A2E310, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000007, func_802CFD30, 0x00000007, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFFFFFFC0, 0x00000087, 0x00000055, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFFFFFFC0, 0x00000087, 0x00000055, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000032, 0x00000027, 0x00000002, 0xFE363C80, 0x00000006, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000013, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000007, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000036, 0x00000001, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD491, 0xFE363C8F, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80244454_A2E694, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000010, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80244934_A2EB74, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x000000A5, 0x00000060, 0x00000098, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003CF, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000040, 0x00000022, 0x0000003A, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, func_802CFD30, 0x00000007, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000027, 0x00000002, 0xFE363C80, 0x00000046, 0x0000000D, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000013, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000007, 0x00000008, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x000000FF, 0x00000043, 0x00000007, func_802CFD30, 0x00000008, 0x00000008, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x000000FF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD491, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0013000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00180008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x0060000E, 0x00000043, 0x0000000F, PlayEffect, 0x00000034, 0x00000002, 0x00000000, 0x000000B4, 0x00000000, 0xF24A84E0, 0xF4ACD48F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000035, 0x00000001, 0x00000000, 0x000000C8, 0x00000000, 0xF24A7E80, 0xF4ACD490, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241B40_A2BD80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241F54_A2C194, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000028, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x0000009D, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249718_A33958, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0018000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0x00000024, 0x00000043, 0x00000005, SetNpcRotation, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000036, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD491, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000078, 0x00000024, 0x00000002, 0xFE363C81, 0x0000037F, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF4, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000000FF, 0x000000FF, 0x000000FF, 0xFE363C81, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x000000A5, 0x00000060, 0x00000098, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003CF, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000069, 0x0000003C, 0x00000066, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003CF, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000040, 0x00000022, 0x0000003A, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000022, 0x0000000E, 0x0000001C, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x0000007F, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000075, 0x0000001C, 0x0000002A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD491, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000019, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDA, 0x000000D2, 0x00000055, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249744_A33984, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001C, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFFFFFFE2, 0x00000096, 0x000000A2, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFFFFFFE2, 0x00000096, 0x000000A2, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600011, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000017, 0x0000000A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000066, 0x0000002D, 0x00000000, 0x00000072, 0x00000000, 0x00000000, 0x00000003, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000066, 0x0000002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000D, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x000000B4, 0x000000B4, 0x000000B4, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000003E3, 0x00000005, 0x00000001, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000036B, 0x00000005, 0x00000001, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000000, 0x00000000, 0xFE363C80, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFE4, 0x00000024, 0x00000002, 0xFE363C81, 0x000000D2, 0x00000024, 0x00000002, 0xFE363C82, 0x0000009B, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE4, 0x00000024, 0x00000002, 0xFE363C84, 0x000000D1, 0x00000024, 0x00000002, 0xFE363C85, 0x00000099, 0x00000043, 0x00000001, func_80242024_A2C264, 0x00000043, 0x0000000F, PlayEffect, 0x00000037, 0x00000000, 0xFFFFFFE2, 0x000000D2, 0x0000008E, 0x00000000, 0x000000B4, 0x00000000, 0x00000005, 0x00000002, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001D, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802421E0_A2C420, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0x00000000, 0x000000B4, 0x00000000, 0xF24A7D50, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, RemoveEffect, 0xF4ACD48F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000019, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDA, 0x000000D2, 0x00000055, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249770_A339B0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001A, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802422A0_A2C4E0, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF10, 0x000000C8, 0x00000071, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_8024979C_A339DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000030, 0x00000001, D_8024A9D0_A34C10, 0x00000005, 0x00000001, 0x0000000A, 0x00000038, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000009, 0x00000030, 0x00000001, D_8024A9D0_A34C10, 0x00000005, 0x00000001, 0x0000000A, 0x00000038, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E1A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002E, 0x00000002, 0xFE363C82, 0xF24A7E1A, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000001E, 0x000000E8, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_802497C8_A33A08, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x00000000, 0x000000AA, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000000, 0x000000AA, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000014, 0x00000014, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0x00000104, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFEB, 0x00000043, 0x00000001, func_80240FE0_A2B220, 0x00000008, 0x00000001, 0x00000023, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000000FF, 0x00000000, 0x00000000, 0x000003E3, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000005C, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x0000006A, 0x0000005E, 0x0000006E, 0x000000D8, 0x000000C3, 0x00000083, 0x00000008, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000064, 0x00000069, 0x0000006B, 0x0000009F, 0x00000076, 0x00000032, 0x00000014, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x0000007A, 0x000000B4, 0x0000006E, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x00000080, 0x00000080, 0x00000080, 0x000000FF, 0x000000FF, 0x000000C8, 0x0000003C, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802423D4_A2C614, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000B1, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_802497F4_A33A34, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001F, 0x00000043, 0x0000000F, PlayEffect, 0x00000035, 0x00000002, 0x00000014, 0x00000109, 0xFFFFFFEB, 0xF24A7E80, 0xF4ACD492, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000003C, 0x00000002, 0x00000014, 0x00000109, 0xFFFFFFEB, 0xF24A7E80, 0xF4ACD493, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000078, 0x00000024, 0x00000002, 0xFE363C81, 0x0000037F, 0x00000005, 0x00000001, 0x00000014, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFA, 0x00000027, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000000FF, 0x000000FF, 0x000000FF, 0xFE363C81, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000028, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x0000009D, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249718_A33958, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00130008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140009, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00180008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD492, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD493, 0x00000057, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000039, 0x00000000, 0x00000012, 0x00000100, 0xFFFFFFEB, 0xF24A7C20, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000078, 0x00000026, 0x00000002, 0xFE363C81, 0x0000037F, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A8480, 0x00000043, 0x0000000A, func_80240880_A2AAC0, 0x00000000, 0x00000000, 0x00000000, 0xFE363C80, 0x000000FF, 0x000000FF, 0x000000FF, 0xFE363C81, 0x000003E8, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000023, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000046, 0x000000C8, 0xFFFFFF11, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_802496C0_A33900, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0013000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00140007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00150006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00160006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00170008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0018000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD481, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD482, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD483, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD484, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD485, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD486, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x0000003B, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0xF4ACD487, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x0000006E, 0x0000006E, 0x0000006E, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000008, func_802409C4_A2AC04, 0x000000E6, 0x000000E6, 0x000000E6, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FF, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000002, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000003, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000005, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000006, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000007D, 0x00000002, 0xFFFFFF7E, 0x000000DC, 0x00000082, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF7E, 0x00000024, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C82, 0x00000082, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A0280, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000044, 0x00000001, D_80249AA8_A33CE8, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD481, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000004, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000072, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000010, 0x00000010, 0x00000002, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD488, 0xFE363C8F, 0x00000043, 0x00000004, func_802428C8_A2CB08, 0x00000001, 0x0000001E, 0xF24A7C80, 0x00000043, 0x00000005, LoadPath, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, func_80240E50_A2B090, 0xF4ACD488, 0xF4ACD493, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7A60, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xFE363C84, 0xFE363C84, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240F30_A2B170, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00120004, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000001, 0x00000043, 0x00000002, func_802D7B10, 0xF4ACD488, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000028, 0x000000C8, 0xFFFFFFD8, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249820_A33A60, 0x00000043, 0x00000002, RemoveEffect, 0xF4ACD490, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00800018, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000007, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600012, 0x00000044, 0x00000001, D_80249B48_A33D88, 0x00000043, 0x00000001, func_802425A0_A2C7E0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600009, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600012, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x0060000D, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600009, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242704_A2C944, 0x00000043, 0x00000003, func_80240DA0_A2AFE0, 0x00000000, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000003, LoadSettings, 0x00000000, D_80249878_A33AB8, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0080001B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242F74_A2D1B4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80244550_A2E790, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x0060000B, 0x00000043, 0x00000001, func_8024301C_A2D25C, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000043, 0x00000001, func_80240F88_A2B1C8, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x0060000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00600011, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000006, 0xF24A7A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00800017, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80244774_A2E9B4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_8024486C_A2EAAC, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_80240DF8_A2B038, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s b/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s
index 316167b967..1fb7b4c4e8 100644
--- a/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s
@@ -14,20 +14,20 @@ dlabel hos_06_varStash
 dlabel D_80242C0C_A3C0EC
 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80242C6C_A3C14C
+dlabel hos_06_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80242C70_A3C150
+dlabel hos_06_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80242C74_A3C154
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, hos_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242E08_A3C2E8
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242E88_A3C368
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242E08_A3C2E8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242E08_A3C2E8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, hos_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802431AC_A3C68C
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242E88_A3C368, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s b/ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s
index d19abd8686..a2c303fd9c 100644
--- a/ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s
@@ -2,14 +2,14 @@
 
 .section .data
 
-dlabel D_802445D0_A3DAB0
+dlabel dup_hos_06_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802445D4_A3DAB4
+dlabel dup_hos_06_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802445D8_A3DAB8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240FD0_A3A4B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_hos_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024471C_A3DBFC
 .word 0x00000043, 0x00000002, func_80241008_A3A4E8, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D8_A3DAB8, 0x00000010, 0x00000000, hos_06_D_80246430, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F7C_A3A45C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -30,10 +30,7 @@ dlabel D_802447D8_A3DCB8
 .word 0x0000010A, 0xFFFFFFF3, 0x00220002, 0x0000010C, 0x0000002B, 0x00220004, 0x0000012F, 0xFFFFFFB6, 0x00220003, 0x000000E1, 0xFFFFFFB6, 0x00220005, 0x000000EB, 0xFFFFFFCB, 0x00220007, 0x0000012E, 0xFFFFFFDF, 0x00220008, 0x000000E4, 0xFFFFFFA7, 0x00220006, 0x000000EF, 0x00000019, 0x00220000, 0x00000123, 0x0000003F, 0x00220009, 0x00000124, 0xFFFFFFC5, 0x0022000B, 0x00000109, 0xFFFFFFA7, 0x0022000C, 0x0000010B, 0x00000029, 0x0022000D, 0x000000E0, 0xFFFFFFF3, 0x00220011, 0x00000107, 0xFFFFD8F0, 0x0022000E, 0x000000E8, 0xFFFFFFB9, 0x0022000F, 0x00000117, 0x0000000B, 0x00220010, 0x00000108, 0x00000029, 0x00220012, 0x000000EE, 0xFFFFFFB6, 0x0022000A, 0x00000126, 0x0000002B, 0x00220013, 0x000000E9, 0xFFFFFFCB, 0x00220016, 0x000000ED, 0xFFFFFFD8, 0x00220041, 0x00000104, 0xFFFFFFA7, 0x00220014, 0x00000106, 0x0000004D, 0x00220017, 0x00000129, 0xFFFFFFCB, 0x00220018, 0x00000132, 0xFFFFFFF6, 0x00220019, 0x00000133, 0x0000005E, 0x0022001A, 0x000000E7, 0xFFFFFFCE, 0x0022001B, 0x00000134, 0xFFFFD8F0, 0x0022001D, 0x000000F8, 0xFFFFFFCE, 0x0022001E, 0x00000135, 0xFFFFFFA7, 0x00220020, 0x000000FF, 0x00002712, 0x00220021, 0x00000136, 0x0000000B, 0x00220022, 0x00000140, 0x00002712, 0x00220023, 0x00000141, 0x0000002B, 0x00220024, 0x00000105, 0x00002712, 0x00220025, 0x00000138, 0x0000002B, 0x00220026, 0x000000E3, 0xFFFFFFCB, 0x00220027, 0x00000116, 0x0000004D, 0x00220028, 0x00000113, 0x0000004D, 0x00220029, 0x000000F4, 0x00000007, 0x0022002A, 0x000000E2, 0x00002712, 0x0022002B, 0x0000013C, 0xFFFFFFF6, 0x0022002C, 0x000000F5, 0x00002712, 0x00220038, 0x00000100, 0x00002712, 0x00220034, 0x000000FA, 0xFFFFFFF6, 0x00220035, 0x000000EC, 0x00000019, 0x00220036, 0x000000E5, 0xFFFFFFC2, 0x0022002F, 0x00000112, 0xFFFFD8F0, 0x0022002D, 0x00000111, 0xFFFFFFF3, 0x0022002E, 0x0000010D, 0xFFFFFFCB, 0x00220030, 0x000000F9, 0xFFFFFFDF, 0x00220037, 0x000000F2, 0x00002712, 0x00220031, 0x00000130, 0x00000029, 0x00220032, 0x0000013A, 0xFFFFFFB9, 0x00220039, 0x000000F1, 0x00002712, 0x00220033, 0x000000FB, 0xFFFFFFF6, 0x0022003A, 0x00000114, 0x0000003F, 0x0022003B, 0x000000F7, 0xFFFFFFC2, 0x0022003C, 0x000000F3, 0x00002712, 0x00220042, 0x000000FC, 0x00002712, 0x00220043, 0x00000103, 0xFFFFFFBA, 0x00220044, 0x0000011A, 0x00002712, 0x00220045, 0x0000011B, 0x00002712, 0x00220046, 0x000000FD, 0x00002712, 0x0022004A, 0x0000011F, 0xFFFFFFB6, 0x00220048, 0x0000011E, 0xFFFFFFF6, 0x0022004B, 0x0000011D, 0xFFFFD8F0, 0x00220049, 0x000000FE, 0x00002712, 0x0022004E, 0x000000E6, 0xFFFFFFB6, 0x0022004C, 0x0000011C, 0xFFFFFFBA, 0x0022004D, 0x00000120, 0x0000000F, 0x00220015, 0x00000143, 0xFFFFFFF3, 0x0022003D, 0x00000145, 0xFFFFFFCB, 0x0022003E, 0x00000146, 0xFFFFD8F0, 0x0022003F, 0x00000147, 0x0000003F, 0x00220040, 0x00000148, 0xFFFFFFBA, 0x00220047, 0x00000144, 0x00002712, 0x0022001C, 0x0000014A, 0x00000007, 0x0022001F, 0x0000014D, 0x00000007
 
 dlabel D_80244B88_A3E068
-.word 0x0022004F
-
-dlabel D_80244B8C_A3E06C
-.word 0xF8405D31, 0xFFFFFFC5, 0x00220050, 0xF8405D32, 0xFFFFFFD8, 0x00220051, 0xF8405D33, 0x00000018, 0x00220052, 0xF8405D34, 0x0000003D, 0x00220053, 0xF8405D35, 0x0000000F, 0x00220054, 0xF8405E51, 0xFFFFFFC5, 0x00220055, 0xF8405EBD, 0xFFFFFFB5, 0x00220056, 0xF8405F07, 0xFFFFFFC2, 0x00220057, 0xF8405F96, 0xFFFFFFE1, 0x00220058, 0xF840602A, 0xFFFFFFF6, 0x00220059, 0xF840607E, 0x0000000B, 0x0022005A, 0xF84060B0, 0x00000018, 0x0022005B, 0xF84060B1, 0x00000018, 0x0022005C, 0xF84060FA, 0x0000002B, 0x0022005D, 0xF84060FB, 0x0000002B, 0x0022005E, 0xF8406131, 0x0000003F
+.word 0x0022004F, 0xF8405D31, 0xFFFFFFC5, 0x00220050, 0xF8405D32, 0xFFFFFFD8, 0x00220051, 0xF8405D33, 0x00000018, 0x00220052, 0xF8405D34, 0x0000003D, 0x00220053, 0xF8405D35, 0x0000000F, 0x00220054, 0xF8405E51, 0xFFFFFFC5, 0x00220055, 0xF8405EBD, 0xFFFFFFB5, 0x00220056, 0xF8405F07, 0xFFFFFFC2, 0x00220057, 0xF8405F96, 0xFFFFFFE1, 0x00220058, 0xF840602A, 0xFFFFFFF6, 0x00220059, 0xF840607E, 0x0000000B, 0x0022005A, 0xF84060B0, 0x00000018, 0x0022005B, 0xF84060B1, 0x00000018, 0x0022005C, 0xF84060FA, 0x0000002B, 0x0022005D, 0xF84060FB, 0x0000002B, 0x0022005E, 0xF8406131, 0x0000003F
 
 dlabel D_80244C48_A3E128
 .word 0x0022005F
diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
index a88ecc6af9..1daffe855f 100644
--- a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s
@@ -14,14 +14,14 @@ dlabel D_80242FFC_B2F46C
 dlabel D_8024301C_B2F48C
 .word 0x00000000, 0x00300020, 0x00000000, 0x00000000, D_80242FFC_B2F46C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_80243048_B2F4B8
+dlabel jan_02_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_8024304C_B2F4BC
+dlabel jan_02_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80243050_B2F4C0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241540_B2D9B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241578_B2D9E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243050_B2F4C0, 0x00000010, 0x00000000, D_80248760_jan_02, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802414EC_B2D95C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, jan_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241578_B2D9E8, 0xFE363C80, 0x0000004E, 0x00000006, D_80243050_B2F4C0, 0x00000010, 0x00000000, D_80248760_jan_02, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802414EC_B2D95C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel jan_02_varStash
 .word 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
index fd5fdba2f9..06d0e09eea 100644
--- a/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_03/B39530.data.s
@@ -122,20 +122,20 @@ dlabel D_80246F44_B3BB14
 dlabel D_8024709C_B3BC6C
 .word 0x00000043, 0x00000004, jan_03_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8024A6B8_B3F288, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, jan_03_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, jan_03_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246F44_B3BB14, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A718_B3F2E8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80246ECC_B3BA9C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, jan_03_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, jan_03_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8024A9AC_B3F57C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, jan_03_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80247444_B3C014
+dlabel jan_03_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80247448_B3C018
+dlabel jan_03_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_8024744C_B3C01C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241A2C_B365FC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, jan_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247590_B3C160
 .word 0x00000043, 0x00000002, func_80241A64_B36634, 0xFE363C80, 0x0000004E, 0x00000006, D_8024744C_B3C01C, 0x00000010, 0x00000000, D_8024FBA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802475E0_B3C1B0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241A2C_B365FC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, jan_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247714_B3C2E4
 .word 0x00000043, 0x00000002, func_80241B00_B366D0, 0xFE363C80, 0x0000004E, 0x00000006, D_802475E0_B3C1B0, 0x00000010, 0x00000000, D_8024FD68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -216,7 +216,7 @@ dlabel D_80249D8C_B3E95C
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80249E0C_B3E9DC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80249D8C_B3E95C, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241A2C_B365FC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80249D8C_B3E95C, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, jan_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A130_B3ED00
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241A64_B36634, 0xFE363C80, 0x0000004E, 0x00000006, D_80249E0C_B3E9DC, 0x00000010, 0x00000000, D_8024FBA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802419D8_B365A8, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s
index 3866a12f29..ab43ab0f93 100644
--- a/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s
+++ b/ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s
@@ -2,17 +2,17 @@
 
 .section .data
 
-dlabel D_80241F10_AF4BB0
+dlabel kkj_18_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80241F14_AF4BB4
+dlabel kkj_18_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80241F18_AF4BB8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, kkj_18_D_80244CB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_18_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, kkj_18_D_80244CB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802420AC_AF4D4C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, kkj_18_D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_18_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, kkj_18_D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242230_AF4ED0
 .word 0xC1B80000, 0x41F00000, 0x42100000, 0x41800000, 0x42780000, 0xC1200000, 0x42800000, 0x425C0000, 0x40A00000, 0x42E00000, 0x42380000, 0x41A00000, 0x43200000, 0x42700000, 0xC1C80000
diff --git a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s
index 4f5bd72812..5e8c80e7df 100644
--- a/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s
+++ b/ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s
@@ -2,17 +2,17 @@
 
 .section .data
 
-dlabel D_80241B10_AF9460
+dlabel kkj_19_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80241B14_AF9464
+dlabel kkj_19_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80241B18_AF9468
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, kkj_19_D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, kkj_19_D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241CAC_AF95FC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_kkj_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kkj_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_kkj_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241E30_AF9780
 .word 0x0000005D, 0x0000005E, 0x0000005F, 0x00000061, 0x00000060, 0x00000062, 0x00000063, 0x00000064, 0x00000065, 0x00000066
diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
index 579b6bf94b..30fdc3a19d 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
@@ -107,14 +107,14 @@ dlabel D_80247D80_8B7DF0
 dlabel D_80247DAC_8B7E1C
 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_80247E30_8B7EA0
+dlabel kmr_02_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80247E34_8B7EA4
+dlabel kmr_02_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80247E38_8B7EA8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kmr_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247FCC_8B803C
 .word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001
@@ -144,7 +144,7 @@ dlabel D_80248154_8B81C4
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802481D4_8B8244
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kmr_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802484F8_8B8568
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s b/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s
index 9fa52872ef..722e03cb81 100644
--- a/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_81/A79200.data.s
@@ -5,17 +5,17 @@
 dlabel D_80240D40_A79200
 .word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_80240D98_A79258
+dlabel kpa_81_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80240D9C_A7925C
+dlabel kpa_81_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80240DA0_A79260
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402D0_A78790, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A787C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DA0_A79260, 0x00000010, 0x00000000, func_80242040_8B20B0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A787C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DA0_A79260, 0x00000010, 0x00000000, func_80242040_8B20B0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240F34_A793F4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402D0_A78790, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A78864, 0xFE363C80, 0x0000004E, 0x00000006, D_80240F34_A793F4, 0x00000010, 0x00000000, D_80242208, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_81_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_81_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A78864, 0xFE363C80, 0x0000004E, 0x00000006, D_80240F34_A793F4, 0x00000010, 0x00000000, D_80242208, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7873C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802410B8_A79578
 .word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s b/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s
index 9e08188e04..85fdea8201 100644
--- a/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s
+++ b/ver/us/asm/data/world/area_kpa/kpa_82/A7AF80.data.s
@@ -32,17 +32,17 @@ dlabel D_80240BD4_A7B0D4
 dlabel D_80240BF4_A7B0F4
 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80240BD4_A7B0D4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000E0000
 
-dlabel D_80240C20_A7B120
+dlabel kpa_82_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80240C24_A7B124
+dlabel kpa_82_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80240C28_A7B128
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_82_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402D0_A7A7D0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A7A808, 0xFE363C80, 0x0000004E, 0x00000006, D_80240C28_A7B128, 0x00000010, 0x00000000, D_80248F90, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_82_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_82_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240308_A7A808, 0xFE363C80, 0x0000004E, 0x00000006, D_80240C28_A7B128, 0x00000010, 0x00000000, D_80248F90, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240DBC_A7B2BC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_82_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402D0_A7A7D0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A7A8A4, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DBC_A7B2BC, 0x00000010, 0x00000000, D_80249158, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kpa_82_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kpa_82_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802403A4_A7A8A4, 0xFE363C80, 0x0000004E, 0x00000006, D_80240DBC_A7B2BC, 0x00000010, 0x00000000, D_80249158, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024027C_A7A77C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80240F40_A7B440
 .word 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AA680, 0xF24A5280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24BDA80, 0xF24E7CE7, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24D8680, 0xF24CB280, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
index 57da0d2cb4..54691a656d 100644
--- a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
@@ -83,20 +83,20 @@ dlabel D_80248370_7F3080
 dlabel D_80248390_7F30A0
 .word 0x00AF0001, 0x0023001C, D_80248230_7F2F40, D_802482A4_7F2FB4, 0x00000000, 0x00000000, D_80248324_7F3034, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248230_7F2F40, D_802482A4_7F2FB4, D_80248370_7F3080, 0x00000000, D_80248324_7F3034, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
 
-dlabel D_802483E8_7F30F8
+dlabel mac_00_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802483EC_7F30FC
+dlabel mac_00_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802483F0_7F3100
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248534_7F3244
 .word 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_802483F0_7F3100, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248584_7F3294
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802486B8_7F33C8
 .word 0x00000043, 0x00000002, func_80241A18_7EC728, 0xFE363C80, 0x0000004E, 0x00000006, D_80248584_7F3294, 0x00000010, 0x00000000, mac_00_D_80255D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -105,7 +105,7 @@ dlabel D_80248708_7F3418
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248788_7F3498
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_7F3418, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_7F3418, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248AAC_7F37BC
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_7F3498, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s
index f5b5c4b25a..616413d88a 100644
--- a/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_00/7F9850.data.s
@@ -29,20 +29,20 @@ dlabel dup_mac_00_varStash
 dlabel D_8024ECEC_7F99FC
 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_8024ED4C_7F9A5C
+dlabel dup_mac_00_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_8024ED50_7F9A60
+dlabel dup_mac_00_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_8024ED54_7F9A64
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243798_7EE4A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024ED54_7F9A64, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024ED54_7F9A64, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024EEE8_7F9BF8
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024EF68_7F9C78
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024EEE8_7F9BF8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243798_7EE4A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024EEE8_7F9BF8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_mac_00_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024F28C_7F9F9C
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802437D0_7EE4E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024EF68_7F9C78, 0x00000010, 0x00000000, D_80255EE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243744_7EE454, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
index e091341a20..858a8ef99f 100644
--- a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
@@ -188,14 +188,14 @@ dlabel D_8024D444_80DCC4
 dlabel D_8024D59C_80DE1C
 .word 0x00000043, 0x00000004, mac_01_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025BAE0_81C360, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, mac_01_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, mac_01_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D444_80DCC4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8025BB80_81C400, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024D3CC_80DC4C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_01_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, mac_01_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025BDDC_81C65C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, mac_01_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_8024D944_80E1C4
+dlabel mac_01_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_8024D948_80E1C8
+dlabel mac_01_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_8024D94C_80E1CC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024DA90_80E310
 .word 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024D94C_80E1CC, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -204,7 +204,7 @@ dlabel D_8024DAE0_80E360
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024DB60_80E3E0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024DAE0_80E360, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024DAE0_80E360, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024DE84_80E704
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024DB60_80E3E0, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
index bef31bbc52..929a222493 100644
--- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
@@ -110,20 +110,20 @@ dlabel D_802486D0_82B990
 dlabel D_80248700_82B9C0
 .word 0x00000043, 0x00000002, BasicAI_Main, D_802486D0_82B990, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, 0x00000000, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802485C0_82B880, D_80248634_82B8F4, D_80248700_82B9C0, 0x00000000, D_802486B4_82B974, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
 
-dlabel D_80248778_82BA38
+dlabel mac_02_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_8024877C_82BA3C
+dlabel mac_02_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80248780_82BA40
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802488C4_82BB84
 .word 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248780_82BA40, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248914_82BBD4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248A48_82BD08
 .word 0x00000043, 0x00000002, func_80242BA8_825E68, 0xFE363C80, 0x0000004E, 0x00000006, D_80248914_82BBD4, 0x00000010, 0x00000000, mac_02_D_8024E738, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -177,7 +177,7 @@ dlabel D_8024A1B4_82D474
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A234_82D4F4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A558_82D818
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
index b92f7c8a57..9f36bc8635 100644
--- a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
@@ -98,20 +98,20 @@ dlabel D_80248BC4_83A3C4
 dlabel D_80248BF4_83A3F4
 .word 0x00000043, 0x00000002, BasicAI_Main, D_80248BC4_83A3C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, 0x00000000, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, D_80248BF4_83A3F4, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
 
-dlabel D_80248C6C_83A46C
+dlabel mac_03_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80248C70_83A470
+dlabel mac_03_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80248C74_83A474
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248E08_83A608
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248E88_83A688
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802491AC_83A9AC
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
index b174784d11..ac8dd37fc9 100644
--- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
@@ -98,14 +98,14 @@ dlabel D_80246598_849168
 dlabel D_802465B8_849188
 .word 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, 0x00000000, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80246458_849028, D_802464CC_84909C, D_80246598_849168, 0x00000000, D_8024654C_84911C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
 
-dlabel D_80246610_8491E0
+dlabel mac_04_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80246614_8491E4
+dlabel mac_04_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80246618_8491E8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241774_844344, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_04_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024675C_84932C
 .word 0x00000043, 0x00000002, func_802417AC_84437C, 0xFE363C80, 0x0000004E, 0x00000006, D_80246618_8491E8, 0x00000010, 0x00000000, mac_04_D_8024F5D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241720_8442F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
index 7df1a1e249..ba9dd44b0d 100644
--- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
@@ -92,20 +92,20 @@ dlabel D_80247660_8597D0
 dlabel D_80247680_8597F0
 .word 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, 0x00000000, 0x00000000, D_80247614_859784, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80247520_859690, D_80247594_859704, D_80247660_8597D0, 0x00000000, D_80247614_859784, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
 
-dlabel D_802476D8_859848
+dlabel mac_05_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802476DC_85984C
+dlabel mac_05_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802476E0_859850
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247824_859994
 .word 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_802476E0_859850, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247874_8599E4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802479A8_859B18
 .word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, mac_05_D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -114,7 +114,7 @@ dlabel D_802479F8_859B68
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247A78_859BE8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247D9C_859F0C
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
index c46bc73b80..ce61d97f2e 100644
--- a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
@@ -176,20 +176,20 @@ dlabel D_802484F4_9CD8D4
 dlabel D_80248514_9CD8F4
 .word 0x00AF0001, 0x0023001C, D_802483B4_9CD794, D_80248428_9CD808, 0x00000000, 0x00000000, D_802484A8_9CD888, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_802483B4_9CD794, D_80248428_9CD808, D_802484F4_9CD8D4, 0x00000000, D_802484A8_9CD888, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
 
-dlabel D_8024856C_9CD94C
+dlabel nok_01_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80248570_9CD950
+dlabel nok_01_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80248574_9CD954
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, nok_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248708_9CDAE8
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248788_9CDB68
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_9CDAE8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_9CDAE8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, nok_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248AAC_9CDE8C
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_9CDB68, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s
index a1c2c8141c..9956810b51 100644
--- a/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s
@@ -11,14 +11,14 @@ dlabel D_80244EC0_9DBEE0
 dlabel dup_nok_02_varStash
 .word 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80245434_9DC454
+dlabel nok_02_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80245438_9DC458
+dlabel nok_02_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_8024543C_9DC45C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240678_9D7698, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406B0_9D76D0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024543C_9DC45C, 0x00000010, 0x00000000, nok_02_D_802547D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240624_9D7644, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406B0_9D76D0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024543C_9DC45C, 0x00000010, 0x00000000, nok_02_D_802547D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240624_9D7644, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802455D0_9DC5F0
 .word 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80254600, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
index 75af3acd29..0ae4df3d1b 100644
--- a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s
@@ -110,14 +110,14 @@ dlabel D_80249678_9E0698
 dlabel D_80249698_9E06B8
 .word 0x00AF0001, 0x0023001C, D_80249538_9E0558, D_802495AC_9E05CC, 0x00000000, 0x00000000, D_8024962C_9E064C, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80249538_9E0558, D_802495AC_9E05CC, D_80249678_9E0698, 0x00000000, D_8024962C_9E064C, 0x00000000, 0x00000C01, 0x00000000, 0x00630010
 
-dlabel D_802496F0_9E0710
+dlabel dup_nok_02_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802496F4_9E0714
+dlabel dup_nok_02_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802496F8_9E0718
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024983C_9E085C
 .word 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_802496F8_9E0718, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -129,7 +129,7 @@ dlabel D_802498D4_9E08F4
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80249954_9E0974
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802498D4_9E08F4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802498D4_9E08F4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup_nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80249C78_9E0C98
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_80249954_9E0974, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s b/ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s
index f9eb3a084f..1a63d9459d 100644
--- a/ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s
+++ b/ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s
@@ -2,20 +2,20 @@
 
 .section .data
 
-dlabel D_80252400_9E9420
+dlabel dup2_nok_02_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80252404_9E9424
+dlabel dup2_nok_02_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80252408_9E9428
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243C40_9DAC60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup2_nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8025254C_9E956C
 .word 0x00000043, 0x00000002, func_80243C78_9DAC98, 0xFE363C80, 0x0000004E, 0x00000006, D_80252408_9E9428, 0x00000010, 0x00000000, nok_02_D_80254BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8025259C_9E95BC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243C40_9DAC60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dup2_nok_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802526D0_9E96F0
 .word 0x00000043, 0x00000002, func_80243D14_9DAD34, 0xFE363C80, 0x0000004E, 0x00000006, D_8025259C_9E95BC, 0x00000010, 0x00000000, nok_02_D_80254D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s
index c18666790b..43728446c0 100644
--- a/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s
+++ b/ver/us/asm/data/world/area_obk/obk_01/BC11A0.data.s
@@ -23,20 +23,20 @@ dlabel obk_01_varStash
 dlabel D_802440F4_BC1294
 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80244154_BC12F4
+dlabel obk_01_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80244158_BC12F8
+dlabel obk_01_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_8024415C_BC12FC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_8024415C_BC12FC, 0x00000010, 0x00000000, obk_01_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, obk_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_8024415C_BC12FC, 0x00000010, 0x00000000, obk_01_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802442F0_BC1490
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244370_BC1510
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802442F0_BC1490, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240B78_BBDD18, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802442F0_BC1490, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, obk_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244694_BC1834
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240BB0_BBDD50, 0xFE363C80, 0x0000004E, 0x00000006, D_80244370_BC1510, 0x00000010, 0x00000000, obk_01_802458F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240B24_BBDCC4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s b/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s
index 67ea359075..5c54716d70 100644
--- a/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s
+++ b/ver/us/asm/data/world/area_obk/obk_03/BC7120.data.s
@@ -11,20 +11,20 @@ dlabel obk_03_varStash
 dlabel D_80242ED0_BC7150
 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80242F30_BC71B0
+dlabel obk_03_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80242F34_BC71B4
+dlabel obk_03_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80242F38_BC71B8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240508_BC4788, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242F38_BC71B8, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, obk_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242F38_BC71B8, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802430CC_BC734C
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024314C_BC73CC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802430CC_BC734C, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240508_BC4788, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, obk_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802430CC_BC734C, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, obk_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243470_BC76F0
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240540_BC47C0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024314C_BC73CC, 0x00000010, 0x00000000, D_80243BE0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404B4_BC4734, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s b/ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s
index 89be52643a..d29de6a355 100644
--- a/ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_05/DB4770.data.s
@@ -47,14 +47,14 @@ dlabel D_80242FD0_DB5290
 dlabel D_8024306C_DB532C
 .word 0x00000000, 0x0044003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_80243098_DB5358
+dlabel omo_05_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_8024309C_DB535C
+dlabel omo_05_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802430A0_DB5360
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802421CC_DB448C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, omo_05_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802431D4_DB5494
 .word 0x00000043, 0x00000002, func_80242204_DB44C4, 0xFE363C80, 0x0000004E, 0x00000006, D_802430A0_DB5360, 0x00000010, 0x00000000, D_80245650, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242178_DB4438, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s b/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s
index 0b650c14e9..d6a9c3bcf0 100644
--- a/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s
+++ b/ver/us/asm/data/world/area_omo/omo_13/DE3F70.data.s
@@ -23,14 +23,14 @@ dlabel D_80241BAC_DE403C
 dlabel D_80241BD8_DE4068
 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001
 
-dlabel D_80241C04_DE4094
+dlabel omo_13_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80241C08_DE4098
+dlabel omo_13_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80241C0C_DE409C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240F54_DE33E4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, omo_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, omo_13_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241D40_DE41D0
 .word 0x00000043, 0x00000002, func_80240F8C_DE341C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C0C_DE409C, 0x00000010, 0x00000000, omo_13_80243220, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F00_DE3390, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s b/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s
index c0bc3e7e5e..5c5e004994 100644
--- a/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s
+++ b/ver/us/asm/data/world/area_osr/osr_01/AB1150.data.s
@@ -11,20 +11,20 @@ dlabel osr_01_varStash
 dlabel D_802411BC_AB11AC
 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_8024121C_AB120C
+dlabel osr_01_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80241220_AB1210
+dlabel osr_01_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80241224_AB1214
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406F8_AB06E8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241224_AB1214, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, osr_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241224_AB1214, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802413B8_AB13A8
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241438_AB1428
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802413B8_AB13A8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406F8_AB06E8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, osr_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802413B8_AB13A8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, osr_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024175C_AB174C
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240730_AB0720, 0xFE363C80, 0x0000004E, 0x00000006, D_80241438_AB1428, 0x00000010, 0x00000000, jan_02_Quizmo_SetCamVfov, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802406A4_AB0694, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_01/D4EF50.data.s b/ver/us/asm/data/world/area_pra/pra_01/D4EF50.data.s
index 7b4b7b9c8e..c24424339b 100644
--- a/ver/us/asm/data/world/area_pra/pra_01/D4EF50.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_01/D4EF50.data.s
@@ -5,17 +5,17 @@
 dlabel D_80241F10_D4EF50
 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_80241F94_D4EFD4
+dlabel pra_01_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80241F98_D4EFD8
+dlabel pra_01_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80241F9C_D4EFDC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241200_D4E240, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241238_D4E278, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F9C_D4EFDC, 0x00000010, 0x00000000, D_80242FB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802411AC_D4E1EC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241238_D4E278, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F9C_D4EFDC, 0x00000010, 0x00000000, D_80242FB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802411AC_D4E1EC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242130_D4F170
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241200_D4E240, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802412D4_D4E314, 0xFE363C80, 0x0000004E, 0x00000006, D_80242130_D4F170, 0x00000010, 0x00000000, pra_01_80243178, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802411AC_D4E1EC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802412D4_D4E314, 0xFE363C80, 0x0000004E, 0x00000006, D_80242130_D4F170, 0x00000010, 0x00000000, pra_01_80243178, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802411AC_D4E1EC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802422B4_D4F2F4
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s b/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s
index a6718bd280..06887d4f2b 100644
--- a/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_02/D52A80.data.s
@@ -5,14 +5,14 @@
 dlabel D_80242A90_D52A80
 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00460019, D_80242A90_D52A80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_80242ACC_D52ABC
+dlabel pra_02_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80242AD0_D52AC0
+dlabel pra_02_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80242AD4_D52AC4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D51190, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D511C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80242AD4_D52AC4, 0x00000010, 0x00000000, func_80243CC0_A2DF00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D511C8, 0xFE363C80, 0x0000004E, 0x00000006, D_80242AD4_D52AC4, 0x00000010, 0x00000000, func_80243CC0_A2DF00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242C68_D52C58
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D51190, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D51264, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C68_D52C58, 0x00000010, 0x00000000, D_80243E88_846A58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D51264, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C68_D52C58, 0x00000010, 0x00000000, D_80243E88_846A58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D5113C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
index 7449450c8a..9efd242112 100644
--- a/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_09/D59F80.data.s
@@ -32,17 +32,17 @@ dlabel D_80241D40_D5A5D0
 dlabel D_80241D6C_D5A5FC
 .word 0x00000000, 0x00170014, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000
 
-dlabel D_80241D98_D5A628
+dlabel pra_09_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80241D9C_D5A62C
+dlabel pra_09_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80241DA0_D5A630
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D59A30, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, flo_18_shakeTree, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, flo_18_shakeTree, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241F34_D5A7C4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D59A30, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D59B04, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F34_D5A7C4, 0x00000010, 0x00000000, D_80246BE8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D59B04, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F34_D5A7C4, 0x00000010, 0x00000000, D_80246BE8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802420B8_D5A948
 .word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6480, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s b/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s
index 903e5a8e83..3cbd80ae63 100644
--- a/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_13/D66880.data.s
@@ -5,17 +5,17 @@
 dlabel D_802422A0_D66880
 .word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_802422CC_D668AC
+dlabel pra_13_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802422D0_D668B0
+dlabel pra_13_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802422D4_D668B4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D65780, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D657B8, 0xFE363C80, 0x0000004E, 0x00000006, D_802422D4_D668B4, 0x00000010, 0x00000000, D_80243720, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_13_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D657B8, 0xFE363C80, 0x0000004E, 0x00000006, D_802422D4_D668B4, 0x00000010, 0x00000000, D_80243720, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242468_D66A48
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D65780, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D65854, 0xFE363C80, 0x0000004E, 0x00000006, D_80242468_D66A48, 0x00000010, 0x00000000, pra_13_802438E8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_13_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_13_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D65854, 0xFE363C80, 0x0000004E, 0x00000006, D_80242468_D66A48, 0x00000010, 0x00000000, pra_13_802438E8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6572C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802425EC_D66BCC
 .word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000028, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C84, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s b/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
index 883558aeea..5e51afa71e 100644
--- a/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_19/D70A70.data.s
@@ -17,17 +17,17 @@ dlabel D_80242144_D70AF4
 dlabel D_80242170_D70B20
 .word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_8024219C_D70B4C
+dlabel pra_19_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802421A0_D70B50
+dlabel pra_19_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802421A4_D70B54
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D6FB50, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D6FB88, 0xFE363C80, 0x0000004E, 0x00000006, D_802421A4_D70B54, 0x00000010, 0x00000000, D_802479F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D6FB88, 0xFE363C80, 0x0000004E, 0x00000006, D_802421A4_D70B54, 0x00000010, 0x00000000, D_802479F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242338_D70CE8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802411A0_D6FB50, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D6FC24, 0xFE363C80, 0x0000004E, 0x00000006, D_80242338_D70CE8, 0x00000010, 0x00000000, D_80247BB8_pra_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D6FC24, 0xFE363C80, 0x0000004E, 0x00000006, D_80242338_D70CE8, 0x00000010, 0x00000000, D_80247BB8_pra_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D6FAFC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802424BC_D70E6C
 .word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AAA80, 0xF24A6480, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2524A80, 0xF24ACA80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_pra/pra_31/D7FEC0.data.s b/ver/us/asm/data/world/area_pra/pra_31/D7FEC0.data.s
index 7ddd87f1bf..6964c8bcd7 100644
--- a/ver/us/asm/data/world/area_pra/pra_31/D7FEC0.data.s
+++ b/ver/us/asm/data/world/area_pra/pra_31/D7FEC0.data.s
@@ -8,17 +8,17 @@ dlabel D_80241160_D7FEC0
 dlabel D_80241170_D7FED0
 .word 0x00000000, 0x00460032, D_80241160_D7FEC0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_8024119C_D7FEFC
+dlabel pra_31_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802411A0_D7FF00
+dlabel pra_31_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802411A4_D7FF04
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_31_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402A0_D7F000, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802402D8_D7F038, 0xFE363C80, 0x0000004E, 0x00000006, D_802411A4_D7FF04, 0x00000010, 0x00000000, D_80247CA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024024C_D7EFAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_31_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_31_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802402D8_D7F038, 0xFE363C80, 0x0000004E, 0x00000006, D_802411A4_D7FF04, 0x00000010, 0x00000000, D_80247CA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024024C_D7EFAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241338_D80098
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_31_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802402A0_D7F000, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240374_D7F0D4, 0xFE363C80, 0x0000004E, 0x00000006, D_80241338_D80098, 0x00000010, 0x00000000, D_80247E68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024024C_D7EFAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_31_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_31_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240374_D7F0D4, 0xFE363C80, 0x0000004E, 0x00000006, D_80241338_D80098, 0x00000010, 0x00000000, D_80247E68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024024C_D7EFAC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802414BC_D8021C
 .word 0x00000043, 0x00000001, func_80240410_D7F170, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000002D, 0x00000086, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000005A, 0x00000021, 0x00000002, 0x00000087, 0x000000E0, 0x00000024, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0001, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x00000021, 0x00000002, 0x000000E1, 0x0000013A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000010E, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x004F0002, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000010E, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F84, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F85, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240468_D7F1C8, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F86, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F87, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F88, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000001ED, 0x00000000, 0x00000014, 0x00000001, 0xFE363C85, 0x0000001D, 0x00000001, 0x0000005A, 0x0000001D, 0x00000001, 0x0000010E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000021C, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0xFE363C8A, 0x0000001C, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x00000014, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0xFE363C86, 0x00000014, 0x00000001, 0xFE363C83, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C85, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C85, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C85, 0x00000023, 0x00000000, 0x00000043, 0x00000003, func_80240818_D7F578, 0xFE363C83, 0xFE363C85, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFE363C86, 0xFE363C86, 0x00000005, 0xFE363C84, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
index 09c2017fec..6b733f08d8 100644
--- a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s
@@ -83,17 +83,17 @@ dlabel D_802430E4_CFAC54
 dlabel D_802431BC_CFAD2C
 .word 0x00000043, 0x00000003, SetGroupEnabled, 0x0000003F, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0x00000041, 0x00000046, 0x00000001, D_802430E4_CFAC54, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000060, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000000, D_80242CEC_CFA85C, D_80242D1C_CFA88C, 0x00000000, D_80242DC4_CFA934, 0x00000022, 0x00000023, 0x0000006D, D_802430D0_CFAC40, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00001002, D_80242E70_CFA9E0, D_80242ED0_CFAA40, 0x00000000, D_80242F78_CFAAE8, 0x0000002F, 0x00000030, 0x0000009A, D_802430D8_CFAC48, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000000, D_80242EA0_CFAA10, D_80242ED0_CFAA40, 0x00000000, D_8024300C_CFAB7C, 0x00000034, 0x00000035, 0x0000009A, D_802430D8_CFAC48, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_802432D0_CFAE40
+dlabel sam_01_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802432D4_CFAE44
+dlabel sam_01_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802432D8_CFAE48
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405C8_CF8138, 0xFE363C80, 0x0000004E, 0x00000006, D_802432D8_CFAE48, 0x00000010, 0x00000000, D_8024DBC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405C8_CF8138, 0xFE363C80, 0x0000004E, 0x00000006, D_802432D8_CFAE48, 0x00000010, 0x00000000, D_8024DBC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024346C_CFAFDC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_CF81D4, 0xFE363C80, 0x0000004E, 0x00000006, D_8024346C_CFAFDC, 0x00000010, 0x00000000, D_8024DD88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_CF81D4, 0xFE363C80, 0x0000004E, 0x00000006, D_8024346C_CFAFDC, 0x00000010, 0x00000000, D_8024DD88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel sam_01_varStash
 .word 0x00000000
@@ -183,7 +183,7 @@ dlabel D_80245CC0_CFD830
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80245D40_CFD8B0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80245CC0_CFD830, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_CF8100, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80245CC0_CFD830, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_01_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80246064_CFDBD4
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802405C8_CF8138, 0xFE363C80, 0x0000004E, 0x00000006, D_80245D40_CFD8B0, 0x00000010, 0x00000000, D_8024DBC0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_CF80AC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_04/D16E20.data.s b/ver/us/asm/data/world/area_sam/sam_04/D16E20.data.s
index 9b27792850..c7e1c8b19f 100644
--- a/ver/us/asm/data/world/area_sam/sam_04/D16E20.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_04/D16E20.data.s
@@ -5,17 +5,17 @@
 dlabel D_80243850_D16E20
 .word 0x00000000, 0x003C0028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000
 
-dlabel D_8024387C_D16E4C
+dlabel sam_04_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80243880_D16E50
+dlabel sam_04_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80243884_D16E54
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_D13B60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405C8_D13B98, 0xFE363C80, 0x0000004E, 0x00000006, D_80243884_D16E54, 0x00000010, 0x00000000, sam_04_80245210, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_D13B0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_04_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405C8_D13B98, 0xFE363C80, 0x0000004E, 0x00000006, D_80243884_D16E54, 0x00000010, 0x00000000, sam_04_80245210, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_D13B0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243A18_D16FE8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240590_D13B60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_D13C34, 0xFE363C80, 0x0000004E, 0x00000006, D_80243A18_D16FE8, 0x00000010, 0x00000000, D_802453D8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_D13B0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_04_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240664_D13C34, 0xFE363C80, 0x0000004E, 0x00000006, D_80243A18_D16FE8, 0x00000010, 0x00000000, D_802453D8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024053C_D13B0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243B9C_D1716C
 .word 0x00000031, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s
index 686dfbf01c..11e88e4a70 100644
--- a/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_06/D23E50.data.s
@@ -56,17 +56,17 @@ dlabel sam_06_varStash
 dlabel D_802443D4_D24264
 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80244434_D242C4
+dlabel sam_06_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80244438_D242C8
+dlabel sam_06_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_8024443C_D242CC
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241DE0_D21C70, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241E18_D21CA8, 0xFE363C80, 0x0000004E, 0x00000006, D_8024443C_D242CC, 0x00000010, 0x00000000, D_8024BEA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241E18_D21CA8, 0xFE363C80, 0x0000004E, 0x00000006, D_8024443C_D242CC, 0x00000010, 0x00000000, D_8024BEA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802445D0_D24460
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241DE0_D21C70, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241EB4_D21D44, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D0_D24460, 0x00000010, 0x00000000, D_8024C068, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241EB4_D21D44, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D0_D24460, 0x00000010, 0x00000000, D_8024C068, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244754_D245E4
 .word D_80246068_D25EF8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80244A88_D24918, 0x00000000
@@ -144,7 +144,7 @@ dlabel D_80246E3C_D26CCC
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80246EBC_D26D4C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80246E3C_D26CCC, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241DE0_D21C70, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sam_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80246E3C_D26CCC, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, sam_06_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802471E0_D27070
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241E18_D21CA8, 0xFE363C80, 0x0000004E, 0x00000006, D_80246EBC_D26D4C, 0x00000010, 0x00000000, D_8024BEA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241D8C_D21C1C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/dead/dead_03/EB1920.data.s b/ver/us/asm/data/world/dead/dead_03/EB1920.data.s
index 8c2974a7eb..5d9b78c5be 100644
--- a/ver/us/asm/data/world/dead/dead_03/EB1920.data.s
+++ b/ver/us/asm/data/world/dead/dead_03/EB1920.data.s
@@ -56,20 +56,20 @@ dlabel dead_03_varStash
 dlabel D_80241784_EB25E4
 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_802417E4_EB2644
+dlabel dead_03_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802417E8_EB2648
+dlabel dead_03_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802417EC_EB264C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241980_EB27E0
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241A00_EB2860
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241D24_EB2B84
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, dead_03_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/dead/flo_12/EDC6D0.data.s b/ver/us/asm/data/world/dead/flo_12/EDC6D0.data.s
index 41fca310d2..430c34161e 100644
--- a/ver/us/asm/data/world/dead/flo_12/EDC6D0.data.s
+++ b/ver/us/asm/data/world/dead/flo_12/EDC6D0.data.s
@@ -38,14 +38,14 @@ dlabel dead_flo_12_varStash
 dlabel D_802417F0_EDD7D0
 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80241850_EDD830
+dlabel dead_flo_12_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80241854_EDD834
+dlabel dead_flo_12_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80241858_EDD838
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_flo_12_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240614_EDC5F4, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_flo_12_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_flo_12_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024199C_EDD97C
 .word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, dead_flo_12_D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/dead/kzn_17/EA3A80.data.s b/ver/us/asm/data/world/dead/kzn_17/EA3A80.data.s
index 3c79c20a32..fc76d01f18 100644
--- a/ver/us/asm/data/world/dead/kzn_17/EA3A80.data.s
+++ b/ver/us/asm/data/world/dead/kzn_17/EA3A80.data.s
@@ -101,20 +101,20 @@ dlabel dead_kzn_17_varStash
 dlabel D_80244158_EA4A58
 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_802441B8_EA4AB8
+dlabel dead_kzn_17_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_802441BC_EA4ABC
+dlabel dead_kzn_17_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_802441C0_EA4AC0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_kzn_17_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244354_EA4C54
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802443D4_EA4CD4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_17_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_kzn_17_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802446F8_EA4FF8
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, dead_kzn_17_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/dead/kzn_19/EAA810.data.s b/ver/us/asm/data/world/dead/kzn_19/EAA810.data.s
index a1cacae7ec..1f6fc66568 100644
--- a/ver/us/asm/data/world/dead/kzn_19/EAA810.data.s
+++ b/ver/us/asm/data/world/dead/kzn_19/EAA810.data.s
@@ -149,20 +149,20 @@ dlabel dead_kzn_19_varStash
 dlabel D_80243D78_EAC858
 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80243DD8_EAC8B8
+dlabel dead_kzn_19_ItemChoice_HasSelectedItem
 .word 0x00000000
 
-dlabel D_80243DDC_EAC8BC
+dlabel dead_kzn_19_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80243DE0_EAC8C0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_kzn_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243F74_EACA54
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243FF4_EACAD4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dead_kzn_19_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, dead_kzn_19_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244318_EACDF8
 .word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, dead_kzn_19_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s b/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s
index b1e46abf28..85268e3e4d 100644
--- a/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s
+++ b/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s
@@ -6,11 +6,11 @@ glabel func_802429C0_EA32C0
 /* EA32C4 802429C4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* EA32C8 802429C8 10A00003 */  beqz      $a1, .L802429D8
 /* EA32CC 802429CC 8C86000C */   lw       $a2, 0xc($a0)
-/* EA32D0 802429D0 3C018024 */  lui       $at, %hi(D_802441B8_EA4AB8)
-/* EA32D4 802429D4 AC2041B8 */  sw        $zero, %lo(D_802441B8_EA4AB8)($at)
+/* EA32D0 802429D0 3C018024 */  lui       $at, %hi(dead_kzn_17_ItemChoice_HasSelectedItem)
+/* EA32D4 802429D4 AC2041B8 */  sw        $zero, %lo(dead_kzn_17_ItemChoice_HasSelectedItem)($at)
 .L802429D8:
-/* EA32D8 802429D8 3C038024 */  lui       $v1, %hi(D_802441B8_EA4AB8)
-/* EA32DC 802429DC 246341B8 */  addiu     $v1, $v1, %lo(D_802441B8_EA4AB8)
+/* EA32D8 802429D8 3C038024 */  lui       $v1, %hi(dead_kzn_17_ItemChoice_HasSelectedItem)
+/* EA32DC 802429DC 246341B8 */  addiu     $v1, $v1, %lo(dead_kzn_17_ItemChoice_HasSelectedItem)
 /* EA32E0 802429E0 8C620000 */  lw        $v0, ($v1)
 /* EA32E4 802429E4 54400003 */  bnel      $v0, $zero, .L802429F4
 /* EA32E8 802429E8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802429C0_EA32C0
 /* EA32F0 802429F0 0000102D */   daddu    $v0, $zero, $zero
 .L802429F4:
 /* EA32F4 802429F4 8CC50000 */  lw        $a1, ($a2)
-/* EA32F8 802429F8 3C068024 */  lui       $a2, %hi(D_802441BC_EA4ABC)
+/* EA32F8 802429F8 3C068024 */  lui       $a2, %hi(dead_kzn_17_ItemChoice_SelectedItemID)
 /* EA32FC 802429FC 0C0B551A */  jal       dead_evt_set_variable
-/* EA3300 80242A00 8CC641BC */   lw       $a2, %lo(D_802441BC_EA4ABC)($a2)
+/* EA3300 80242A00 8CC641BC */   lw       $a2, %lo(dead_kzn_17_ItemChoice_SelectedItemID)($a2)
 /* EA3304 80242A04 24020002 */  addiu     $v0, $zero, 2
 .L80242A08:
 /* EA3308 80242A08 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s b/ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s
deleted file mode 100644
index 8b6cfc0a2c..0000000000
--- a/ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242A14_EA3314
-/* EA3314 80242A14 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EA3318 80242A18 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EA331C 80242A1C 8C82000C */  lw        $v0, 0xc($a0)
-/* EA3320 80242A20 0C0B53A3 */  jal       dead_evt_get_variable
-/* EA3324 80242A24 8C450000 */   lw       $a1, ($v0)
-/* EA3328 80242A28 3C018024 */  lui       $at, %hi(D_802441BC_EA4ABC)
-/* EA332C 80242A2C AC2241BC */  sw        $v0, %lo(D_802441BC_EA4ABC)($at)
-/* EA3330 80242A30 24020002 */  addiu     $v0, $zero, 2
-/* EA3334 80242A34 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EA3338 80242A38 24030001 */  addiu     $v1, $zero, 1
-/* EA333C 80242A3C 3C018024 */  lui       $at, %hi(D_802441B8_EA4AB8)
-/* EA3340 80242A40 AC2341B8 */  sw        $v1, %lo(D_802441B8_EA4AB8)($at)
-/* EA3344 80242A44 03E00008 */  jr        $ra
-/* EA3348 80242A48 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s b/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s
index 62e54a8f52..a0abba7e2f 100644
--- a/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s
+++ b/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s
@@ -6,11 +6,11 @@ glabel func_802417AC_EAA28C
 /* EAA290 802417B0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* EAA294 802417B4 10A00003 */  beqz      $a1, .L802417C4
 /* EAA298 802417B8 8C86000C */   lw       $a2, 0xc($a0)
-/* EAA29C 802417BC 3C018024 */  lui       $at, %hi(D_80243DD8_EAC8B8)
-/* EAA2A0 802417C0 AC203DD8 */  sw        $zero, %lo(D_80243DD8_EAC8B8)($at)
+/* EAA29C 802417BC 3C018024 */  lui       $at, %hi(dead_kzn_19_ItemChoice_HasSelectedItem)
+/* EAA2A0 802417C0 AC203DD8 */  sw        $zero, %lo(dead_kzn_19_ItemChoice_HasSelectedItem)($at)
 .L802417C4:
-/* EAA2A4 802417C4 3C038024 */  lui       $v1, %hi(D_80243DD8_EAC8B8)
-/* EAA2A8 802417C8 24633DD8 */  addiu     $v1, $v1, %lo(D_80243DD8_EAC8B8)
+/* EAA2A4 802417C4 3C038024 */  lui       $v1, %hi(dead_kzn_19_ItemChoice_HasSelectedItem)
+/* EAA2A8 802417C8 24633DD8 */  addiu     $v1, $v1, %lo(dead_kzn_19_ItemChoice_HasSelectedItem)
 /* EAA2AC 802417CC 8C620000 */  lw        $v0, ($v1)
 /* EAA2B0 802417D0 54400003 */  bnel      $v0, $zero, .L802417E0
 /* EAA2B4 802417D4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802417AC_EAA28C
 /* EAA2BC 802417DC 0000102D */   daddu    $v0, $zero, $zero
 .L802417E0:
 /* EAA2C0 802417E0 8CC50000 */  lw        $a1, ($a2)
-/* EAA2C4 802417E4 3C068024 */  lui       $a2, %hi(D_80243DDC_EAC8BC)
+/* EAA2C4 802417E4 3C068024 */  lui       $a2, %hi(dead_kzn_19_ItemChoice_SelectedItemID)
 /* EAA2C8 802417E8 0C0B551A */  jal       dead_evt_set_variable
-/* EAA2CC 802417EC 8CC63DDC */   lw       $a2, %lo(D_80243DDC_EAC8BC)($a2)
+/* EAA2CC 802417EC 8CC63DDC */   lw       $a2, %lo(dead_kzn_19_ItemChoice_SelectedItemID)($a2)
 /* EAA2D0 802417F0 24020002 */  addiu     $v0, $zero, 2
 .L802417F4:
 /* EAA2D4 802417F4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s
deleted file mode 100644
index 1ba585483e..0000000000
--- a/ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241800_EAA2E0
-/* EAA2E0 80241800 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EAA2E4 80241804 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EAA2E8 80241808 8C82000C */  lw        $v0, 0xc($a0)
-/* EAA2EC 8024180C 0C0B53A3 */  jal       dead_evt_get_variable
-/* EAA2F0 80241810 8C450000 */   lw       $a1, ($v0)
-/* EAA2F4 80241814 3C018024 */  lui       $at, %hi(D_80243DDC_EAC8BC)
-/* EAA2F8 80241818 AC223DDC */  sw        $v0, %lo(D_80243DDC_EAC8BC)($at)
-/* EAA2FC 8024181C 24020002 */  addiu     $v0, $zero, 2
-/* EAA300 80241820 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EAA304 80241824 24030001 */  addiu     $v1, $zero, 1
-/* EAA308 80241828 3C018024 */  lui       $at, %hi(D_80243DD8_EAC8B8)
-/* EAA30C 8024182C AC233DD8 */  sw        $v1, %lo(D_80243DD8_EAC8B8)($at)
-/* EAA310 80241830 03E00008 */  jr        $ra
-/* EAA314 80241834 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s b/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s
index e7b1d16e74..ea569bd606 100644
--- a/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s
+++ b/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s
@@ -6,11 +6,11 @@ glabel func_80240654_EB14B4
 /* EB14B8 80240658 AFBF0010 */  sw        $ra, 0x10($sp)
 /* EB14BC 8024065C 10A00003 */  beqz      $a1, .L8024066C
 /* EB14C0 80240660 8C86000C */   lw       $a2, 0xc($a0)
-/* EB14C4 80240664 3C018024 */  lui       $at, %hi(D_802417E4_EB2644)
-/* EB14C8 80240668 AC2017E4 */  sw        $zero, %lo(D_802417E4_EB2644)($at)
+/* EB14C4 80240664 3C018024 */  lui       $at, %hi(dead_03_ItemChoice_HasSelectedItem)
+/* EB14C8 80240668 AC2017E4 */  sw        $zero, %lo(dead_03_ItemChoice_HasSelectedItem)($at)
 .L8024066C:
-/* EB14CC 8024066C 3C038024 */  lui       $v1, %hi(D_802417E4_EB2644)
-/* EB14D0 80240670 246317E4 */  addiu     $v1, $v1, %lo(D_802417E4_EB2644)
+/* EB14CC 8024066C 3C038024 */  lui       $v1, %hi(dead_03_ItemChoice_HasSelectedItem)
+/* EB14D0 80240670 246317E4 */  addiu     $v1, $v1, %lo(dead_03_ItemChoice_HasSelectedItem)
 /* EB14D4 80240674 8C620000 */  lw        $v0, ($v1)
 /* EB14D8 80240678 54400003 */  bnel      $v0, $zero, .L80240688
 /* EB14DC 8024067C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240654_EB14B4
 /* EB14E4 80240684 0000102D */   daddu    $v0, $zero, $zero
 .L80240688:
 /* EB14E8 80240688 8CC50000 */  lw        $a1, ($a2)
-/* EB14EC 8024068C 3C068024 */  lui       $a2, %hi(D_802417E8_EB2648)
+/* EB14EC 8024068C 3C068024 */  lui       $a2, %hi(dead_03_ItemChoice_SelectedItemID)
 /* EB14F0 80240690 0C0B551A */  jal       dead_evt_set_variable
-/* EB14F4 80240694 8CC617E8 */   lw       $a2, %lo(D_802417E8_EB2648)($a2)
+/* EB14F4 80240694 8CC617E8 */   lw       $a2, %lo(dead_03_ItemChoice_SelectedItemID)($a2)
 /* EB14F8 80240698 24020002 */  addiu     $v0, $zero, 2
 .L8024069C:
 /* EB14FC 8024069C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s b/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s
index d0fd085498..039a27eb14 100644
--- a/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s
+++ b/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s
@@ -6,11 +6,11 @@ glabel func_802405C0_EDC5A0
 /* EDC5A4 802405C4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* EDC5A8 802405C8 10A00003 */  beqz      $a1, .L802405D8
 /* EDC5AC 802405CC 8C86000C */   lw       $a2, 0xc($a0)
-/* EDC5B0 802405D0 3C018024 */  lui       $at, %hi(D_80241850_EDD830)
-/* EDC5B4 802405D4 AC201850 */  sw        $zero, %lo(D_80241850_EDD830)($at)
+/* EDC5B0 802405D0 3C018024 */  lui       $at, %hi(dead_flo_12_ItemChoice_HasSelectedItem)
+/* EDC5B4 802405D4 AC201850 */  sw        $zero, %lo(dead_flo_12_ItemChoice_HasSelectedItem)($at)
 .L802405D8:
-/* EDC5B8 802405D8 3C038024 */  lui       $v1, %hi(D_80241850_EDD830)
-/* EDC5BC 802405DC 24631850 */  addiu     $v1, $v1, %lo(D_80241850_EDD830)
+/* EDC5B8 802405D8 3C038024 */  lui       $v1, %hi(dead_flo_12_ItemChoice_HasSelectedItem)
+/* EDC5BC 802405DC 24631850 */  addiu     $v1, $v1, %lo(dead_flo_12_ItemChoice_HasSelectedItem)
 /* EDC5C0 802405E0 8C620000 */  lw        $v0, ($v1)
 /* EDC5C4 802405E4 54400003 */  bnel      $v0, $zero, .L802405F4
 /* EDC5C8 802405E8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802405C0_EDC5A0
 /* EDC5D0 802405F0 0000102D */   daddu    $v0, $zero, $zero
 .L802405F4:
 /* EDC5D4 802405F4 8CC50000 */  lw        $a1, ($a2)
-/* EDC5D8 802405F8 3C068024 */  lui       $a2, %hi(D_80241854_EDD834)
+/* EDC5D8 802405F8 3C068024 */  lui       $a2, %hi(dead_flo_12_ItemChoice_SelectedItemID)
 /* EDC5DC 802405FC 0C0B551A */  jal       dead_evt_set_variable
-/* EDC5E0 80240600 8CC61854 */   lw       $a2, %lo(D_80241854_EDD834)($a2)
+/* EDC5E0 80240600 8CC61854 */   lw       $a2, %lo(dead_flo_12_ItemChoice_SelectedItemID)($a2)
 /* EDC5E4 80240604 24020002 */  addiu     $v0, $zero, 2
 .L80240608:
 /* EDC5E8 80240608 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s b/ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s
deleted file mode 100644
index f3ba7d9810..0000000000
--- a/ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240614_EDC5F4
-/* EDC5F4 80240614 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* EDC5F8 80240618 AFBF0010 */  sw        $ra, 0x10($sp)
-/* EDC5FC 8024061C 8C82000C */  lw        $v0, 0xc($a0)
-/* EDC600 80240620 0C0B53A3 */  jal       dead_evt_get_variable
-/* EDC604 80240624 8C450000 */   lw       $a1, ($v0)
-/* EDC608 80240628 3C018024 */  lui       $at, %hi(D_80241854_EDD834)
-/* EDC60C 8024062C AC221854 */  sw        $v0, %lo(D_80241854_EDD834)($at)
-/* EDC610 80240630 24020002 */  addiu     $v0, $zero, 2
-/* EDC614 80240634 8FBF0010 */  lw        $ra, 0x10($sp)
-/* EDC618 80240638 24030001 */  addiu     $v1, $zero, 1
-/* EDC61C 8024063C 3C018024 */  lui       $at, %hi(D_80241850_EDD830)
-/* EDC620 80240640 AC231850 */  sw        $v1, %lo(D_80241850_EDD830)($at)
-/* EDC624 80240644 03E00008 */  jr        $ra
-/* EDC628 80240648 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s
deleted file mode 100644
index 8b2d92384c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s
+++ /dev/null
@@ -1,114 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802410E4_A2B324
-/* A2B324 802410E4 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* A2B328 802410E8 F7B40018 */  sdc1      $f20, 0x18($sp)
-/* A2B32C 802410EC 4485A000 */  mtc1      $a1, $f20
-/* A2B330 802410F0 F7B60020 */  sdc1      $f22, 0x20($sp)
-/* A2B334 802410F4 4486B000 */  mtc1      $a2, $f22
-/* A2B338 802410F8 44876000 */  mtc1      $a3, $f12
-/* A2B33C 802410FC C7A20038 */  lwc1      $f2, 0x38($sp)
-/* A2B340 80241100 460C103C */  c.lt.s    $f2, $f12
-/* A2B344 80241104 00000000 */  nop
-/* A2B348 80241108 45000002 */  bc1f      .L80241114
-/* A2B34C 8024110C AFBF0010 */   sw       $ra, 0x10($sp)
-/* A2B350 80241110 46001306 */  mov.s     $f12, $f2
-.L80241114:
-/* A2B354 80241114 24020002 */  addiu     $v0, $zero, 2
-/* A2B358 80241118 10820016 */  beq       $a0, $v0, .L80241174
-/* A2B35C 8024111C 28820003 */   slti     $v0, $a0, 3
-/* A2B360 80241120 10400005 */  beqz      $v0, .L80241138
-/* A2B364 80241124 24020001 */   addiu    $v0, $zero, 1
-/* A2B368 80241128 1082000A */  beq       $a0, $v0, .L80241154
-/* A2B36C 8024112C 46026303 */   div.s    $f12, $f12, $f2
-/* A2B370 80241130 08090493 */  j         .L8024124C
-/* A2B374 80241134 4614B001 */   sub.s    $f0, $f22, $f20
-.L80241138:
-/* A2B378 80241138 24020003 */  addiu     $v0, $zero, 3
-/* A2B37C 8024113C 10820021 */  beq       $a0, $v0, .L802411C4
-/* A2B380 80241140 24020004 */   addiu    $v0, $zero, 4
-/* A2B384 80241144 10820034 */  beq       $a0, $v0, .L80241218
-/* A2B388 80241148 46026303 */   div.s    $f12, $f12, $f2
-/* A2B38C 8024114C 08090493 */  j         .L8024124C
-/* A2B390 80241150 4614B001 */   sub.s    $f0, $f22, $f20
-.L80241154:
-/* A2B394 80241154 3C0142B4 */  lui       $at, 0x42b4
-/* A2B398 80241158 44810000 */  mtc1      $at, $f0
-/* A2B39C 8024115C 00000000 */  nop
-/* A2B3A0 80241160 46006302 */  mul.s     $f12, $f12, $f0
-/* A2B3A4 80241164 0C00A8BB */  jal       sin_deg
-/* A2B3A8 80241168 00000000 */   nop
-/* A2B3AC 8024116C 08090492 */  j         .L80241248
-/* A2B3B0 80241170 46000306 */   mov.s    $f12, $f0
-.L80241174:
-/* A2B3B4 80241174 3C0141F0 */  lui       $at, 0x41f0
-/* A2B3B8 80241178 44810000 */  mtc1      $at, $f0
-/* A2B3BC 8024117C 00000000 */  nop
-/* A2B3C0 80241180 4600603C */  c.lt.s    $f12, $f0
-/* A2B3C4 80241184 00000000 */  nop
-/* A2B3C8 80241188 45020004 */  bc1fl     .L8024119C
-/* A2B3CC 8024118C 46006301 */   sub.s    $f12, $f12, $f0
-/* A2B3D0 80241190 44806000 */  mtc1      $zero, $f12
-/* A2B3D4 80241194 08090493 */  j         .L8024124C
-/* A2B3D8 80241198 4614B001 */   sub.s    $f0, $f22, $f20
-.L8024119C:
-/* A2B3DC 8024119C 46001001 */  sub.s     $f0, $f2, $f0
-/* A2B3E0 802411A0 3C0142B4 */  lui       $at, 0x42b4
-/* A2B3E4 802411A4 44811000 */  mtc1      $at, $f2
-/* A2B3E8 802411A8 46006303 */  div.s     $f12, $f12, $f0
-/* A2B3EC 802411AC 46026302 */  mul.s     $f12, $f12, $f2
-/* A2B3F0 802411B0 00000000 */  nop
-/* A2B3F4 802411B4 3C01C2B4 */  lui       $at, 0xc2b4
-/* A2B3F8 802411B8 44810000 */  mtc1      $at, $f0
-/* A2B3FC 802411BC 0809048C */  j         .L80241230
-/* A2B400 802411C0 46006300 */   add.s    $f12, $f12, $f0
-.L802411C4:
-/* A2B404 802411C4 3C014334 */  lui       $at, 0x4334
-/* A2B408 802411C8 44810000 */  mtc1      $at, $f0
-/* A2B40C 802411CC 46026303 */  div.s     $f12, $f12, $f2
-/* A2B410 802411D0 46006302 */  mul.s     $f12, $f12, $f0
-/* A2B414 802411D4 00000000 */  nop
-/* A2B418 802411D8 3C0142B4 */  lui       $at, 0x42b4
-/* A2B41C 802411DC 44810000 */  mtc1      $at, $f0
-/* A2B420 802411E0 0C00A8BB */  jal       sin_deg
-/* A2B424 802411E4 46006301 */   sub.s    $f12, $f12, $f0
-/* A2B428 802411E8 3C013F80 */  lui       $at, 0x3f80
-/* A2B42C 802411EC 44811000 */  mtc1      $at, $f2
-/* A2B430 802411F0 00000000 */  nop
-/* A2B434 802411F4 46020000 */  add.s     $f0, $f0, $f2
-/* A2B438 802411F8 3C013FE0 */  lui       $at, 0x3fe0
-/* A2B43C 802411FC 44811800 */  mtc1      $at, $f3
-/* A2B440 80241200 44801000 */  mtc1      $zero, $f2
-/* A2B444 80241204 46000021 */  cvt.d.s   $f0, $f0
-/* A2B448 80241208 46220002 */  mul.d     $f0, $f0, $f2
-/* A2B44C 8024120C 00000000 */  nop
-/* A2B450 80241210 08090492 */  j         .L80241248
-/* A2B454 80241214 46200320 */   cvt.s.d  $f12, $f0
-.L80241218:
-/* A2B458 80241218 3C0142B4 */  lui       $at, 0x42b4
-/* A2B45C 8024121C 44810000 */  mtc1      $at, $f0
-/* A2B460 80241220 00000000 */  nop
-/* A2B464 80241224 46006302 */  mul.s     $f12, $f12, $f0
-/* A2B468 80241228 00000000 */  nop
-/* A2B46C 8024122C 46006301 */  sub.s     $f12, $f12, $f0
-.L80241230:
-/* A2B470 80241230 0C00A8BB */  jal       sin_deg
-/* A2B474 80241234 00000000 */   nop
-/* A2B478 80241238 3C013F80 */  lui       $at, 0x3f80
-/* A2B47C 8024123C 44811000 */  mtc1      $at, $f2
-/* A2B480 80241240 00000000 */  nop
-/* A2B484 80241244 46020300 */  add.s     $f12, $f0, $f2
-.L80241248:
-/* A2B488 80241248 4614B001 */  sub.s     $f0, $f22, $f20
-.L8024124C:
-/* A2B48C 8024124C 460C0002 */  mul.s     $f0, $f0, $f12
-/* A2B490 80241250 00000000 */  nop
-/* A2B494 80241254 4600A000 */  add.s     $f0, $f20, $f0
-/* A2B498 80241258 8FA2003C */  lw        $v0, 0x3c($sp)
-/* A2B49C 8024125C E4400000 */  swc1      $f0, ($v0)
-/* A2B4A0 80241260 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A2B4A4 80241264 D7B60020 */  ldc1      $f22, 0x20($sp)
-/* A2B4A8 80241268 D7B40018 */  ldc1      $f20, 0x18($sp)
-/* A2B4AC 8024126C 03E00008 */  jr        $ra
-/* A2B4B0 80241270 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s
deleted file mode 100644
index 0f073104b2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s
+++ /dev/null
@@ -1,115 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_8024F1E8_A39428
-.double 0.2
-
-.section .text
-
-glabel func_802416BC_A2B8FC
-/* A2B8FC 802416BC 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* A2B900 802416C0 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* A2B904 802416C4 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A2B908 802416C8 3C04800B */  lui       $a0, %hi(gCameras)
-/* A2B90C 802416CC 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* A2B910 802416D0 AFBF0020 */  sw        $ra, 0x20($sp)
-/* A2B914 802416D4 AFB3001C */  sw        $s3, 0x1c($sp)
-/* A2B918 802416D8 AFB20018 */  sw        $s2, 0x18($sp)
-/* A2B91C 802416DC AFB10014 */  sw        $s1, 0x14($sp)
-/* A2B920 802416E0 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2B924 802416E4 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* A2B928 802416E8 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* A2B92C 802416EC 00031080 */  sll       $v0, $v1, 2
-/* A2B930 802416F0 00431021 */  addu      $v0, $v0, $v1
-/* A2B934 802416F4 00021080 */  sll       $v0, $v0, 2
-/* A2B938 802416F8 00431023 */  subu      $v0, $v0, $v1
-/* A2B93C 802416FC 000218C0 */  sll       $v1, $v0, 3
-/* A2B940 80241700 00431021 */  addu      $v0, $v0, $v1
-/* A2B944 80241704 000210C0 */  sll       $v0, $v0, 3
-/* A2B948 80241708 10A00004 */  beqz      $a1, .L8024171C
-/* A2B94C 8024170C 00449021 */   addu     $s2, $v0, $a0
-/* A2B950 80241710 96420000 */  lhu       $v0, ($s2)
-/* A2B954 80241714 34420008 */  ori       $v0, $v0, 8
-/* A2B958 80241718 A6420000 */  sh        $v0, ($s2)
-.L8024171C:
-/* A2B95C 8024171C 3C118025 */  lui       $s1, %hi(D_80249900_A33B40)
-/* A2B960 80241720 26319900 */  addiu     $s1, $s1, %lo(D_80249900_A33B40)
-/* A2B964 80241724 8E230000 */  lw        $v1, ($s1)
-/* A2B968 80241728 00031100 */  sll       $v0, $v1, 4
-/* A2B96C 8024172C 00431023 */  subu      $v0, $v0, $v1
-/* A2B970 80241730 00021080 */  sll       $v0, $v0, 2
-/* A2B974 80241734 00431021 */  addu      $v0, $v0, $v1
-/* A2B978 80241738 00021080 */  sll       $v0, $v0, 2
-/* A2B97C 8024173C 00431023 */  subu      $v0, $v0, $v1
-/* A2B980 80241740 00021040 */  sll       $v0, $v0, 1
-/* A2B984 80241744 44826000 */  mtc1      $v0, $f12
-/* A2B988 80241748 00000000 */  nop
-/* A2B98C 8024174C 46806320 */  cvt.s.w   $f12, $f12
-/* A2B990 80241750 0C00A8BB */  jal       sin_deg
-/* A2B994 80241754 26530194 */   addiu    $s3, $s2, 0x194
-/* A2B998 80241758 3C108025 */  lui       $s0, %hi(D_80249904_A33B44)
-/* A2B99C 8024175C 26109904 */  addiu     $s0, $s0, %lo(D_80249904_A33B44)
-/* A2B9A0 80241760 8E230000 */  lw        $v1, ($s1)
-/* A2B9A4 80241764 C6140000 */  lwc1      $f20, ($s0)
-/* A2B9A8 80241768 000311C0 */  sll       $v0, $v1, 7
-/* A2B9AC 8024176C 00431023 */  subu      $v0, $v0, $v1
-/* A2B9B0 80241770 00021040 */  sll       $v0, $v0, 1
-/* A2B9B4 80241774 4600A502 */  mul.s     $f20, $f20, $f0
-/* A2B9B8 80241778 00000000 */  nop
-/* A2B9BC 8024177C 44826000 */  mtc1      $v0, $f12
-/* A2B9C0 80241780 00000000 */  nop
-/* A2B9C4 80241784 0C00A8D4 */  jal       cos_deg
-/* A2B9C8 80241788 46806320 */   cvt.s.w  $f12, $f12
-/* A2B9CC 8024178C C6020000 */  lwc1      $f2, ($s0)
-/* A2B9D0 80241790 46001082 */  mul.s     $f2, $f2, $f0
-/* A2B9D4 80241794 00000000 */  nop
-/* A2B9D8 80241798 4480B000 */  mtc1      $zero, $f22
-/* A2B9DC 8024179C 00000000 */  nop
-/* A2B9E0 802417A0 4407B000 */  mfc1      $a3, $f22
-/* A2B9E4 802417A4 4405A000 */  mfc1      $a1, $f20
-/* A2B9E8 802417A8 44061000 */  mfc1      $a2, $f2
-/* A2B9EC 802417AC 0C019E40 */  jal       guTranslateF
-/* A2B9F0 802417B0 0260202D */   daddu    $a0, $s3, $zero
-/* A2B9F4 802417B4 C6020000 */  lwc1      $f2, ($s0)
-/* A2B9F8 802417B8 3C014140 */  lui       $at, 0x4140
-/* A2B9FC 802417BC 44810000 */  mtc1      $at, $f0
-/* A2BA00 802417C0 00000000 */  nop
-/* A2BA04 802417C4 46020001 */  sub.s     $f0, $f0, $f2
-/* A2BA08 802417C8 3C018025 */  lui       $at, %hi(D_8024F1E8_A39428)
-/* A2BA0C 802417CC D424F1E8 */  ldc1      $f4, %lo(D_8024F1E8_A39428)($at)
-/* A2BA10 802417D0 46000021 */  cvt.d.s   $f0, $f0
-/* A2BA14 802417D4 46240002 */  mul.d     $f0, $f0, $f4
-/* A2BA18 802417D8 00000000 */  nop
-/* A2BA1C 802417DC 8E220000 */  lw        $v0, ($s1)
-/* A2BA20 802417E0 460010A1 */  cvt.d.s   $f2, $f2
-/* A2BA24 802417E4 24420001 */  addiu     $v0, $v0, 1
-/* A2BA28 802417E8 46201080 */  add.d     $f2, $f2, $f0
-/* A2BA2C 802417EC AE220000 */  sw        $v0, ($s1)
-/* A2BA30 802417F0 28420015 */  slti      $v0, $v0, 0x15
-/* A2BA34 802417F4 462010A0 */  cvt.s.d   $f2, $f2
-/* A2BA38 802417F8 10400003 */  beqz      $v0, .L80241808
-/* A2BA3C 802417FC E6020000 */   swc1     $f2, ($s0)
-/* A2BA40 80241800 0809060B */  j         .L8024182C
-/* A2BA44 80241804 0000102D */   daddu    $v0, $zero, $zero
-.L80241808:
-/* A2BA48 80241808 4405B000 */  mfc1      $a1, $f22
-/* A2BA4C 8024180C 0260202D */  daddu     $a0, $s3, $zero
-/* A2BA50 80241810 00A0302D */  daddu     $a2, $a1, $zero
-/* A2BA54 80241814 0C019E40 */  jal       guTranslateF
-/* A2BA58 80241818 00A0382D */   daddu    $a3, $a1, $zero
-/* A2BA5C 8024181C 96430000 */  lhu       $v1, ($s2)
-/* A2BA60 80241820 24020001 */  addiu     $v0, $zero, 1
-/* A2BA64 80241824 3063FFF7 */  andi      $v1, $v1, 0xfff7
-/* A2BA68 80241828 A6430000 */  sh        $v1, ($s2)
-.L8024182C:
-/* A2BA6C 8024182C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* A2BA70 80241830 8FB3001C */  lw        $s3, 0x1c($sp)
-/* A2BA74 80241834 8FB20018 */  lw        $s2, 0x18($sp)
-/* A2BA78 80241838 8FB10014 */  lw        $s1, 0x14($sp)
-/* A2BA7C 8024183C 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2BA80 80241840 D7B60030 */  ldc1      $f22, 0x30($sp)
-/* A2BA84 80241844 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* A2BA88 80241848 03E00008 */  jr        $ra
-/* A2BA8C 8024184C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s
deleted file mode 100644
index 3a25b2056e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s
+++ /dev/null
@@ -1,112 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241850_A2BA90
-/* A2BA90 80241850 27BDFF80 */  addiu     $sp, $sp, -0x80
-/* A2BA94 80241854 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* A2BA98 80241858 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A2BA9C 8024185C 3C04800B */  lui       $a0, %hi(gCameras)
-/* A2BAA0 80241860 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* A2BAA4 80241864 AFBF0064 */  sw        $ra, 0x64($sp)
-/* A2BAA8 80241868 AFB20060 */  sw        $s2, 0x60($sp)
-/* A2BAAC 8024186C AFB1005C */  sw        $s1, 0x5c($sp)
-/* A2BAB0 80241870 AFB00058 */  sw        $s0, 0x58($sp)
-/* A2BAB4 80241874 F7B80078 */  sdc1      $f24, 0x78($sp)
-/* A2BAB8 80241878 F7B60070 */  sdc1      $f22, 0x70($sp)
-/* A2BABC 8024187C F7B40068 */  sdc1      $f20, 0x68($sp)
-/* A2BAC0 80241880 00031080 */  sll       $v0, $v1, 2
-/* A2BAC4 80241884 00431021 */  addu      $v0, $v0, $v1
-/* A2BAC8 80241888 00021080 */  sll       $v0, $v0, 2
-/* A2BACC 8024188C 00431023 */  subu      $v0, $v0, $v1
-/* A2BAD0 80241890 000218C0 */  sll       $v1, $v0, 3
-/* A2BAD4 80241894 00431021 */  addu      $v0, $v0, $v1
-/* A2BAD8 80241898 000210C0 */  sll       $v0, $v0, 3
-/* A2BADC 8024189C 10A00004 */  beqz      $a1, .L802418B0
-/* A2BAE0 802418A0 00448821 */   addu     $s1, $v0, $a0
-/* A2BAE4 802418A4 96220000 */  lhu       $v0, ($s1)
-/* A2BAE8 802418A8 34420008 */  ori       $v0, $v0, 8
-/* A2BAEC 802418AC A6220000 */  sh        $v0, ($s1)
-.L802418B0:
-/* A2BAF0 802418B0 3C128025 */  lui       $s2, %hi(D_80249908_A33B48)
-/* A2BAF4 802418B4 26529908 */  addiu     $s2, $s2, %lo(D_80249908_A33B48)
-/* A2BAF8 802418B8 8E430000 */  lw        $v1, ($s2)
-/* A2BAFC 802418BC 00031100 */  sll       $v0, $v1, 4
-/* A2BB00 802418C0 00431023 */  subu      $v0, $v0, $v1
-/* A2BB04 802418C4 00021080 */  sll       $v0, $v0, 2
-/* A2BB08 802418C8 00431021 */  addu      $v0, $v0, $v1
-/* A2BB0C 802418CC 00021080 */  sll       $v0, $v0, 2
-/* A2BB10 802418D0 00431023 */  subu      $v0, $v0, $v1
-/* A2BB14 802418D4 00021040 */  sll       $v0, $v0, 1
-/* A2BB18 802418D8 44826000 */  mtc1      $v0, $f12
-/* A2BB1C 802418DC 00000000 */  nop
-/* A2BB20 802418E0 0C00A8BB */  jal       sin_deg
-/* A2BB24 802418E4 46806320 */   cvt.s.w  $f12, $f12
-/* A2BB28 802418E8 3C108025 */  lui       $s0, %hi(D_8024990C_A33B4C)
-/* A2BB2C 802418EC 2610990C */  addiu     $s0, $s0, %lo(D_8024990C_A33B4C)
-/* A2BB30 802418F0 8E430000 */  lw        $v1, ($s2)
-/* A2BB34 802418F4 C6160000 */  lwc1      $f22, ($s0)
-/* A2BB38 802418F8 000311C0 */  sll       $v0, $v1, 7
-/* A2BB3C 802418FC 00431023 */  subu      $v0, $v0, $v1
-/* A2BB40 80241900 00021040 */  sll       $v0, $v0, 1
-/* A2BB44 80241904 4600B582 */  mul.s     $f22, $f22, $f0
-/* A2BB48 80241908 00000000 */  nop
-/* A2BB4C 8024190C 44826000 */  mtc1      $v0, $f12
-/* A2BB50 80241910 00000000 */  nop
-/* A2BB54 80241914 0C00A8D4 */  jal       cos_deg
-/* A2BB58 80241918 46806320 */   cvt.s.w  $f12, $f12
-/* A2BB5C 8024191C C6140000 */  lwc1      $f20, ($s0)
-/* A2BB60 80241920 4600A502 */  mul.s     $f20, $f20, $f0
-/* A2BB64 80241924 00000000 */  nop
-/* A2BB68 80241928 4480C000 */  mtc1      $zero, $f24
-/* A2BB6C 8024192C 26300194 */  addiu     $s0, $s1, 0x194
-/* A2BB70 80241930 4407C000 */  mfc1      $a3, $f24
-/* A2BB74 80241934 4405B000 */  mfc1      $a1, $f22
-/* A2BB78 80241938 4406A000 */  mfc1      $a2, $f20
-/* A2BB7C 8024193C 0C019E40 */  jal       guTranslateF
-/* A2BB80 80241940 0200202D */   daddu    $a0, $s0, $zero
-/* A2BB84 80241944 4405B000 */  mfc1      $a1, $f22
-/* A2BB88 80241948 4406A000 */  mfc1      $a2, $f20
-/* A2BB8C 8024194C 4407C000 */  mfc1      $a3, $f24
-/* A2BB90 80241950 3C0141A0 */  lui       $at, 0x41a0
-/* A2BB94 80241954 4481B000 */  mtc1      $at, $f22
-/* A2BB98 80241958 0C019E40 */  jal       guTranslateF
-/* A2BB9C 8024195C 0200202D */   daddu    $a0, $s0, $zero
-/* A2BBA0 80241960 4405B000 */  mfc1      $a1, $f22
-/* A2BBA4 80241964 4406C000 */  mfc1      $a2, $f24
-/* A2BBA8 80241968 4407C000 */  mfc1      $a3, $f24
-/* A2BBAC 8024196C 3C013F80 */  lui       $at, 0x3f80
-/* A2BBB0 80241970 4481A000 */  mtc1      $at, $f20
-/* A2BBB4 80241974 27A40018 */  addiu     $a0, $sp, 0x18
-/* A2BBB8 80241978 0C019EC8 */  jal       guRotateF
-/* A2BBBC 8024197C E7B40010 */   swc1     $f20, 0x10($sp)
-/* A2BBC0 80241980 27A40018 */  addiu     $a0, $sp, 0x18
-/* A2BBC4 80241984 0200282D */  daddu     $a1, $s0, $zero
-/* A2BBC8 80241988 0C019D80 */  jal       guMtxCatF
-/* A2BBCC 8024198C 0200302D */   daddu    $a2, $s0, $zero
-/* A2BBD0 80241990 8E430000 */  lw        $v1, ($s2)
-/* A2BBD4 80241994 24020001 */  addiu     $v0, $zero, 1
-/* A2BBD8 80241998 A6220506 */  sh        $v0, 0x506($s1)
-/* A2BBDC 8024199C 2862000A */  slti      $v0, $v1, 0xa
-/* A2BBE0 802419A0 10400004 */  beqz      $v0, .L802419B4
-/* A2BBE4 802419A4 24620001 */   addiu    $v0, $v1, 1
-/* A2BBE8 802419A8 AE420000 */  sw        $v0, ($s2)
-/* A2BBEC 802419AC 08090674 */  j         .L802419D0
-/* A2BBF0 802419B0 0000102D */   daddu    $v0, $zero, $zero
-.L802419B4:
-/* A2BBF4 802419B4 4405B000 */  mfc1      $a1, $f22
-/* A2BBF8 802419B8 4406C000 */  mfc1      $a2, $f24
-/* A2BBFC 802419BC 0200202D */  daddu     $a0, $s0, $zero
-/* A2BC00 802419C0 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2BC04 802419C4 0C019EC8 */  jal       guRotateF
-/* A2BC08 802419C8 00C0382D */   daddu    $a3, $a2, $zero
-/* A2BC0C 802419CC 24020001 */  addiu     $v0, $zero, 1
-.L802419D0:
-/* A2BC10 802419D0 8FBF0064 */  lw        $ra, 0x64($sp)
-/* A2BC14 802419D4 8FB20060 */  lw        $s2, 0x60($sp)
-/* A2BC18 802419D8 8FB1005C */  lw        $s1, 0x5c($sp)
-/* A2BC1C 802419DC 8FB00058 */  lw        $s0, 0x58($sp)
-/* A2BC20 802419E0 D7B80078 */  ldc1      $f24, 0x78($sp)
-/* A2BC24 802419E4 D7B60070 */  ldc1      $f22, 0x70($sp)
-/* A2BC28 802419E8 D7B40068 */  ldc1      $f20, 0x68($sp)
-/* A2BC2C 802419EC 03E00008 */  jr        $ra
-/* A2BC30 802419F0 27BD0080 */   addiu    $sp, $sp, 0x80
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s
deleted file mode 100644
index ded1d4be98..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s
+++ /dev/null
@@ -1,90 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419F4_A2BC34
-/* A2BC34 802419F4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A2BC38 802419F8 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2BC3C 802419FC 0080802D */  daddu     $s0, $a0, $zero
-/* A2BC40 80241A00 AFB10014 */  sw        $s1, 0x14($sp)
-/* A2BC44 80241A04 00A0882D */  daddu     $s1, $a1, $zero
-/* A2BC48 80241A08 AFBF0018 */  sw        $ra, 0x18($sp)
-/* A2BC4C 80241A0C 0C0B36B0 */  jal       resolve_npc
-/* A2BC50 80241A10 24050007 */   addiu    $a1, $zero, 7
-/* A2BC54 80241A14 0200202D */  daddu     $a0, $s0, $zero
-/* A2BC58 80241A18 24050008 */  addiu     $a1, $zero, 8
-/* A2BC5C 80241A1C 0C0B36B0 */  jal       resolve_npc
-/* A2BC60 80241A20 0040802D */   daddu    $s0, $v0, $zero
-/* A2BC64 80241A24 12200017 */  beqz      $s1, .L80241A84
-/* A2BC68 80241A28 0040282D */   daddu    $a1, $v0, $zero
-/* A2BC6C 80241A2C 3C01C280 */  lui       $at, 0xc280
-/* A2BC70 80241A30 44810000 */  mtc1      $at, $f0
-/* A2BC74 80241A34 3C0143C8 */  lui       $at, 0x43c8
-/* A2BC78 80241A38 44811000 */  mtc1      $at, $f2
-/* A2BC7C 80241A3C 3C0142AA */  lui       $at, 0x42aa
-/* A2BC80 80241A40 44812000 */  mtc1      $at, $f4
-/* A2BC84 80241A44 E6000038 */  swc1      $f0, 0x38($s0)
-/* A2BC88 80241A48 E602003C */  swc1      $f2, 0x3c($s0)
-/* A2BC8C 80241A4C E6040040 */  swc1      $f4, 0x40($s0)
-/* A2BC90 80241A50 E4A00038 */  swc1      $f0, 0x38($a1)
-/* A2BC94 80241A54 E4A2003C */  swc1      $f2, 0x3c($a1)
-/* A2BC98 80241A58 E4A40040 */  swc1      $f4, 0x40($a1)
-/* A2BC9C 80241A5C C6000038 */  lwc1      $f0, 0x38($s0)
-/* A2BCA0 80241A60 E600006C */  swc1      $f0, 0x6c($s0)
-/* A2BCA4 80241A64 C4A00038 */  lwc1      $f0, 0x38($a1)
-/* A2BCA8 80241A68 E4A0006C */  swc1      $f0, 0x6c($a1)
-/* A2BCAC 80241A6C C6000040 */  lwc1      $f0, 0x40($s0)
-/* A2BCB0 80241A70 E6000074 */  swc1      $f0, 0x74($s0)
-/* A2BCB4 80241A74 C4A00040 */  lwc1      $f0, 0x40($a1)
-/* A2BCB8 80241A78 3C018025 */  lui       $at, %hi(D_8024F2C8)
-/* A2BCBC 80241A7C E422F2C8 */  swc1      $f2, %lo(D_8024F2C8)($at)
-/* A2BCC0 80241A80 E4A00074 */  swc1      $f0, 0x74($a1)
-.L80241A84:
-/* A2BCC4 80241A84 3C038025 */  lui       $v1, %hi(D_80249910_A33B50)
-/* A2BCC8 80241A88 8C639910 */  lw        $v1, %lo(D_80249910_A33B50)($v1)
-/* A2BCCC 80241A8C 28620014 */  slti      $v0, $v1, 0x14
-/* A2BCD0 80241A90 10400009 */  beqz      $v0, .L80241AB8
-/* A2BCD4 80241A94 00031040 */   sll      $v0, $v1, 1
-/* A2BCD8 80241A98 3C018025 */  lui       $at, %hi(D_80249934_A33B74)
-/* A2BCDC 80241A9C 00220821 */  addu      $at, $at, $v0
-/* A2BCE0 80241AA0 84229934 */  lh        $v0, %lo(D_80249934_A33B74)($at)
-/* A2BCE4 80241AA4 44820000 */  mtc1      $v0, $f0
-/* A2BCE8 80241AA8 00000000 */  nop
-/* A2BCEC 80241AAC 46800020 */  cvt.s.w   $f0, $f0
-/* A2BCF0 80241AB0 080906BE */  j         .L80241AF8
-/* A2BCF4 80241AB4 E600003C */   swc1     $f0, 0x3c($s0)
-.L80241AB8:
-/* A2BCF8 80241AB8 2462FFEC */  addiu     $v0, $v1, -0x14
-/* A2BCFC 80241ABC 3042001E */  andi      $v0, $v0, 0x1e
-/* A2BD00 80241AC0 3C018025 */  lui       $at, %hi(D_80249914_A33B54)
-/* A2BD04 80241AC4 00220821 */  addu      $at, $at, $v0
-/* A2BD08 80241AC8 84229914 */  lh        $v0, %lo(D_80249914_A33B54)($at)
-/* A2BD0C 80241ACC 3C013DCC */  lui       $at, 0x3dcc
-/* A2BD10 80241AD0 3421CCCD */  ori       $at, $at, 0xcccd
-/* A2BD14 80241AD4 44810000 */  mtc1      $at, $f0
-/* A2BD18 80241AD8 44821000 */  mtc1      $v0, $f2
-/* A2BD1C 80241ADC 00000000 */  nop
-/* A2BD20 80241AE0 468010A0 */  cvt.s.w   $f2, $f2
-/* A2BD24 80241AE4 46001082 */  mul.s     $f2, $f2, $f0
-/* A2BD28 80241AE8 00000000 */  nop
-/* A2BD2C 80241AEC C600003C */  lwc1      $f0, 0x3c($s0)
-/* A2BD30 80241AF0 46020000 */  add.s     $f0, $f0, $f2
-/* A2BD34 80241AF4 E600003C */  swc1      $f0, 0x3c($s0)
-.L80241AF8:
-/* A2BD38 80241AF8 C600003C */  lwc1      $f0, 0x3c($s0)
-/* A2BD3C 80241AFC 3C048025 */  lui       $a0, %hi(D_80249910_A33B50)
-/* A2BD40 80241B00 24849910 */  addiu     $a0, $a0, %lo(D_80249910_A33B50)
-/* A2BD44 80241B04 E4A0003C */  swc1      $f0, 0x3c($a1)
-/* A2BD48 80241B08 8C830000 */  lw        $v1, ($a0)
-/* A2BD4C 80241B0C C600003C */  lwc1      $f0, 0x3c($s0)
-/* A2BD50 80241B10 24630001 */  addiu     $v1, $v1, 1
-/* A2BD54 80241B14 E6000070 */  swc1      $f0, 0x70($s0)
-/* A2BD58 80241B18 C4A0003C */  lwc1      $f0, 0x3c($a1)
-/* A2BD5C 80241B1C 286207D0 */  slti      $v0, $v1, 0x7d0
-/* A2BD60 80241B20 AC830000 */  sw        $v1, ($a0)
-/* A2BD64 80241B24 E4A00070 */  swc1      $f0, 0x70($a1)
-/* A2BD68 80241B28 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A2BD6C 80241B2C 8FB10014 */  lw        $s1, 0x14($sp)
-/* A2BD70 80241B30 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2BD74 80241B34 38420001 */  xori      $v0, $v0, 1
-/* A2BD78 80241B38 03E00008 */  jr        $ra
-/* A2BD7C 80241B3C 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s
deleted file mode 100644
index 03c77a2dda..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s
+++ /dev/null
@@ -1,74 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241B40_A2BD80
-/* A2BD80 80241B40 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* A2BD84 80241B44 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2BD88 80241B48 0080802D */  daddu     $s0, $a0, $zero
-/* A2BD8C 80241B4C AFB10014 */  sw        $s1, 0x14($sp)
-/* A2BD90 80241B50 00A0882D */  daddu     $s1, $a1, $zero
-/* A2BD94 80241B54 AFBF0018 */  sw        $ra, 0x18($sp)
-/* A2BD98 80241B58 0C0B36B0 */  jal       resolve_npc
-/* A2BD9C 80241B5C 24050007 */   addiu    $a1, $zero, 7
-/* A2BDA0 80241B60 0200202D */  daddu     $a0, $s0, $zero
-/* A2BDA4 80241B64 24050008 */  addiu     $a1, $zero, 8
-/* A2BDA8 80241B68 0C0B36B0 */  jal       resolve_npc
-/* A2BDAC 80241B6C 0040802D */   daddu    $s0, $v0, $zero
-/* A2BDB0 80241B70 12200017 */  beqz      $s1, .L80241BD0
-/* A2BDB4 80241B74 0040282D */   daddu    $a1, $v0, $zero
-/* A2BDB8 80241B78 3C01C280 */  lui       $at, 0xc280
-/* A2BDBC 80241B7C 44810000 */  mtc1      $at, $f0
-/* A2BDC0 80241B80 3C014307 */  lui       $at, 0x4307
-/* A2BDC4 80241B84 44811000 */  mtc1      $at, $f2
-/* A2BDC8 80241B88 3C0142AA */  lui       $at, 0x42aa
-/* A2BDCC 80241B8C 44812000 */  mtc1      $at, $f4
-/* A2BDD0 80241B90 E6000038 */  swc1      $f0, 0x38($s0)
-/* A2BDD4 80241B94 E602003C */  swc1      $f2, 0x3c($s0)
-/* A2BDD8 80241B98 E6040040 */  swc1      $f4, 0x40($s0)
-/* A2BDDC 80241B9C E4A00038 */  swc1      $f0, 0x38($a1)
-/* A2BDE0 80241BA0 E4A2003C */  swc1      $f2, 0x3c($a1)
-/* A2BDE4 80241BA4 E4A40040 */  swc1      $f4, 0x40($a1)
-/* A2BDE8 80241BA8 C6000038 */  lwc1      $f0, 0x38($s0)
-/* A2BDEC 80241BAC E600006C */  swc1      $f0, 0x6c($s0)
-/* A2BDF0 80241BB0 C4A00038 */  lwc1      $f0, 0x38($a1)
-/* A2BDF4 80241BB4 E4A0006C */  swc1      $f0, 0x6c($a1)
-/* A2BDF8 80241BB8 C6000040 */  lwc1      $f0, 0x40($s0)
-/* A2BDFC 80241BBC E6000074 */  swc1      $f0, 0x74($s0)
-/* A2BE00 80241BC0 C4A00040 */  lwc1      $f0, 0x40($a1)
-/* A2BE04 80241BC4 3C018025 */  lui       $at, %hi(D_8024F2CC)
-/* A2BE08 80241BC8 E422F2CC */  swc1      $f2, %lo(D_8024F2CC)($at)
-/* A2BE0C 80241BCC E4A00074 */  swc1      $f0, 0x74($a1)
-.L80241BD0:
-/* A2BE10 80241BD0 3C048025 */  lui       $a0, %hi(D_8024995C_A33B9C)
-/* A2BE14 80241BD4 2484995C */  addiu     $a0, $a0, %lo(D_8024995C_A33B9C)
-/* A2BE18 80241BD8 8C830000 */  lw        $v1, ($a0)
-/* A2BE1C 80241BDC 2462FFEC */  addiu     $v0, $v1, -0x14
-/* A2BE20 80241BE0 3042001E */  andi      $v0, $v0, 0x1e
-/* A2BE24 80241BE4 3C018025 */  lui       $at, %hi(D_80249960_A33BA0)
-/* A2BE28 80241BE8 00220821 */  addu      $at, $at, $v0
-/* A2BE2C 80241BEC 84229960 */  lh        $v0, %lo(D_80249960_A33BA0)($at)
-/* A2BE30 80241BF0 3C013DCC */  lui       $at, 0x3dcc
-/* A2BE34 80241BF4 3421CCCD */  ori       $at, $at, 0xcccd
-/* A2BE38 80241BF8 44810000 */  mtc1      $at, $f0
-/* A2BE3C 80241BFC 44821000 */  mtc1      $v0, $f2
-/* A2BE40 80241C00 00000000 */  nop
-/* A2BE44 80241C04 468010A0 */  cvt.s.w   $f2, $f2
-/* A2BE48 80241C08 46001082 */  mul.s     $f2, $f2, $f0
-/* A2BE4C 80241C0C 00000000 */  nop
-/* A2BE50 80241C10 C600003C */  lwc1      $f0, 0x3c($s0)
-/* A2BE54 80241C14 46020000 */  add.s     $f0, $f0, $f2
-/* A2BE58 80241C18 E600003C */  swc1      $f0, 0x3c($s0)
-/* A2BE5C 80241C1C E4A0003C */  swc1      $f0, 0x3c($a1)
-/* A2BE60 80241C20 C600003C */  lwc1      $f0, 0x3c($s0)
-/* A2BE64 80241C24 24630001 */  addiu     $v1, $v1, 1
-/* A2BE68 80241C28 E6000070 */  swc1      $f0, 0x70($s0)
-/* A2BE6C 80241C2C C4A0003C */  lwc1      $f0, 0x3c($a1)
-/* A2BE70 80241C30 286207D0 */  slti      $v0, $v1, 0x7d0
-/* A2BE74 80241C34 AC830000 */  sw        $v1, ($a0)
-/* A2BE78 80241C38 E4A00070 */  swc1      $f0, 0x70($a1)
-/* A2BE7C 80241C3C 8FBF0018 */  lw        $ra, 0x18($sp)
-/* A2BE80 80241C40 8FB10014 */  lw        $s1, 0x14($sp)
-/* A2BE84 80241C44 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2BE88 80241C48 38420001 */  xori      $v0, $v0, 1
-/* A2BE8C 80241C4C 03E00008 */  jr        $ra
-/* A2BE90 80241C50 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s
deleted file mode 100644
index c7ac6ac9ea..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s
+++ /dev/null
@@ -1,50 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241C54_A2BE94
-/* A2BE94 80241C54 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
-/* A2BE98 80241C58 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
-/* A2BE9C 80241C5C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* A2BEA0 80241C60 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2BEA4 80241C64 3C118025 */  lui       $s1, %hi(D_80249980_A33BC0)
-/* A2BEA8 80241C68 26319980 */  addiu     $s1, $s1, %lo(D_80249980_A33BC0)
-/* A2BEAC 80241C6C F7B40028 */  sdc1      $f20, 0x28($sp)
-/* A2BEB0 80241C70 3C014170 */  lui       $at, 0x4170
-/* A2BEB4 80241C74 4481A000 */  mtc1      $at, $f20
-/* A2BEB8 80241C78 3C0141F0 */  lui       $at, 0x41f0
-/* A2BEBC 80241C7C 44816000 */  mtc1      $at, $f12
-/* A2BEC0 80241C80 3C03800B */  lui       $v1, %hi(gCameras)
-/* A2BEC4 80241C84 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A2BEC8 80241C88 AFBF0020 */  sw        $ra, 0x20($sp)
-/* A2BECC 80241C8C AFB00018 */  sw        $s0, 0x18($sp)
-/* A2BED0 80241C90 AFB10010 */  sw        $s1, 0x10($sp)
-/* A2BED4 80241C94 8E260000 */  lw        $a2, ($s1)
-/* A2BED8 80241C98 3C073F80 */  lui       $a3, 0x3f80
-/* A2BEDC 80241C9C 00028080 */  sll       $s0, $v0, 2
-/* A2BEE0 80241CA0 02028021 */  addu      $s0, $s0, $v0
-/* A2BEE4 80241CA4 00108080 */  sll       $s0, $s0, 2
-/* A2BEE8 80241CA8 02028023 */  subu      $s0, $s0, $v0
-/* A2BEEC 80241CAC 001010C0 */  sll       $v0, $s0, 3
-/* A2BEF0 80241CB0 02028021 */  addu      $s0, $s0, $v0
-/* A2BEF4 80241CB4 001080C0 */  sll       $s0, $s0, 3
-/* A2BEF8 80241CB8 02038021 */  addu      $s0, $s0, $v1
-/* A2BEFC 80241CBC 0C090411 */  jal       func_80241044_A2B284
-/* A2BF00 80241CC0 4600A386 */   mov.s    $f14, $f20
-/* A2BF04 80241CC4 8E250000 */  lw        $a1, ($s1)
-/* A2BF08 80241CC8 0C090355 */  jal       func_80240D54_A2AF94
-/* A2BF0C 80241CCC 0000202D */   daddu    $a0, $zero, $zero
-/* A2BF10 80241CD0 24020001 */  addiu     $v0, $zero, 1
-/* A2BF14 80241CD4 C6200000 */  lwc1      $f0, ($s1)
-/* A2BF18 80241CD8 0040182D */  daddu     $v1, $v0, $zero
-/* A2BF1C 80241CDC 46140032 */  c.eq.s    $f0, $f20
-/* A2BF20 80241CE0 00000000 */  nop
-/* A2BF24 80241CE4 45010002 */  bc1t      .L80241CF0
-/* A2BF28 80241CE8 A6030506 */   sh       $v1, 0x506($s0)
-/* A2BF2C 80241CEC 0000102D */  daddu     $v0, $zero, $zero
-.L80241CF0:
-/* A2BF30 80241CF0 8FBF0020 */  lw        $ra, 0x20($sp)
-/* A2BF34 80241CF4 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2BF38 80241CF8 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2BF3C 80241CFC D7B40028 */  ldc1      $f20, 0x28($sp)
-/* A2BF40 80241D00 03E00008 */  jr        $ra
-/* A2BF44 80241D04 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D08_A2BF48.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D08_A2BF48.s
deleted file mode 100644
index 3ed3db69f6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D08_A2BF48.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D08_A2BF48
-/* A2BF48 80241D08 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2BF4C 80241D0C 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* A2BF50 80241D10 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A2BF54 80241D14 3C04800B */  lui       $a0, %hi(gCameras)
-/* A2BF58 80241D18 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* A2BF5C 80241D1C AFBF0010 */  sw        $ra, 0x10($sp)
-/* A2BF60 80241D20 00031080 */  sll       $v0, $v1, 2
-/* A2BF64 80241D24 00431021 */  addu      $v0, $v0, $v1
-/* A2BF68 80241D28 00021080 */  sll       $v0, $v0, 2
-/* A2BF6C 80241D2C 00431023 */  subu      $v0, $v0, $v1
-/* A2BF70 80241D30 000218C0 */  sll       $v1, $v0, 3
-/* A2BF74 80241D34 00431021 */  addu      $v0, $v0, $v1
-/* A2BF78 80241D38 000210C0 */  sll       $v0, $v0, 3
-/* A2BF7C 80241D3C 10A00004 */  beqz      $a1, .L80241D50
-/* A2BF80 80241D40 00442021 */   addu     $a0, $v0, $a0
-/* A2BF84 80241D44 94820000 */  lhu       $v0, ($a0)
-/* A2BF88 80241D48 3042FFF7 */  andi      $v0, $v0, 0xfff7
-/* A2BF8C 80241D4C A4820000 */  sh        $v0, ($a0)
-.L80241D50:
-/* A2BF90 80241D50 44800000 */  mtc1      $zero, $f0
-/* A2BF94 80241D54 00000000 */  nop
-/* A2BF98 80241D58 44050000 */  mfc1      $a1, $f0
-/* A2BF9C 80241D5C 24840194 */  addiu     $a0, $a0, 0x194
-/* A2BFA0 80241D60 00A0302D */  daddu     $a2, $a1, $zero
-/* A2BFA4 80241D64 0C019E40 */  jal       guTranslateF
-/* A2BFA8 80241D68 00A0382D */   daddu    $a3, $a1, $zero
-/* A2BFAC 80241D6C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A2BFB0 80241D70 24020002 */  addiu     $v0, $zero, 2
-/* A2BFB4 80241D74 03E00008 */  jr        $ra
-/* A2BFB8 80241D78 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s
deleted file mode 100644
index c737db1069..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s
+++ /dev/null
@@ -1,128 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D7C_A2BFBC
-/* A2BFBC 80241D7C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2BFC0 80241D80 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2BFC4 80241D84 00A0802D */  daddu     $s0, $a1, $zero
-/* A2BFC8 80241D88 AFBF0014 */  sw        $ra, 0x14($sp)
-/* A2BFCC 80241D8C 0C0B36B0 */  jal       resolve_npc
-/* A2BFD0 80241D90 24050009 */   addiu    $a1, $zero, 9
-/* A2BFD4 80241D94 1200000E */  beqz      $s0, .L80241DD0
-/* A2BFD8 80241D98 0040282D */   daddu    $a1, $v0, $zero
-/* A2BFDC 80241D9C 3C01C311 */  lui       $at, 0xc311
-/* A2BFE0 80241DA0 44810000 */  mtc1      $at, $f0
-/* A2BFE4 80241DA4 3C0142E4 */  lui       $at, 0x42e4
-/* A2BFE8 80241DA8 44811000 */  mtc1      $at, $f2
-/* A2BFEC 80241DAC E4A00038 */  swc1      $f0, 0x38($a1)
-/* A2BFF0 80241DB0 3C014387 */  lui       $at, 0x4387
-/* A2BFF4 80241DB4 44810000 */  mtc1      $at, $f0
-/* A2BFF8 80241DB8 E4A20040 */  swc1      $f2, 0x40($a1)
-/* A2BFFC 80241DBC C4A20038 */  lwc1      $f2, 0x38($a1)
-/* A2C000 80241DC0 C4A40040 */  lwc1      $f4, 0x40($a1)
-/* A2C004 80241DC4 E4A0000C */  swc1      $f0, 0xc($a1)
-/* A2C008 80241DC8 E4A2006C */  swc1      $f2, 0x6c($a1)
-/* A2C00C 80241DCC E4A40074 */  swc1      $f4, 0x74($a1)
-.L80241DD0:
-/* A2C010 80241DD0 3C048025 */  lui       $a0, %hi(D_80249984_A33BC4)
-/* A2C014 80241DD4 24849984 */  addiu     $a0, $a0, %lo(D_80249984_A33BC4)
-/* A2C018 80241DD8 8C830000 */  lw        $v1, ($a0)
-/* A2C01C 80241DDC 2402001E */  addiu     $v0, $zero, 0x1e
-/* A2C020 80241DE0 14620005 */  bne       $v1, $v0, .L80241DF8
-/* A2C024 80241DE4 00000000 */   nop
-/* A2C028 80241DE8 3C0142B4 */  lui       $at, 0x42b4
-/* A2C02C 80241DEC 44810000 */  mtc1      $at, $f0
-/* A2C030 80241DF0 00000000 */  nop
-/* A2C034 80241DF4 E4A0000C */  swc1      $f0, 0xc($a1)
-.L80241DF8:
-/* A2C038 80241DF8 8C860000 */  lw        $a2, ($a0)
-/* A2C03C 80241DFC 28C20028 */  slti      $v0, $a2, 0x28
-/* A2C040 80241E00 10400037 */  beqz      $v0, .L80241EE0
-/* A2C044 80241E04 00061880 */   sll      $v1, $a2, 2
-/* A2C048 80241E08 3C028025 */  lui       $v0, %hi(D_802499A8_A33BE8)
-/* A2C04C 80241E0C 244299A8 */  addiu     $v0, $v0, %lo(D_802499A8_A33BE8)
-/* A2C050 80241E10 00621821 */  addu      $v1, $v1, $v0
-/* A2C054 80241E14 84620000 */  lh        $v0, ($v1)
-/* A2C058 80241E18 3C0491A2 */  lui       $a0, 0x91a2
-/* A2C05C 80241E1C 2442FF6F */  addiu     $v0, $v0, -0x91
-/* A2C060 80241E20 44820000 */  mtc1      $v0, $f0
-/* A2C064 80241E24 00000000 */  nop
-/* A2C068 80241E28 46800020 */  cvt.s.w   $f0, $f0
-/* A2C06C 80241E2C E4A00038 */  swc1      $f0, 0x38($a1)
-/* A2C070 80241E30 84620002 */  lh        $v0, 2($v1)
-/* A2C074 80241E34 3484B3C5 */  ori       $a0, $a0, 0xb3c5
-/* A2C078 80241E38 2442FF79 */  addiu     $v0, $v0, -0x87
-/* A2C07C 80241E3C 00021840 */  sll       $v1, $v0, 1
-/* A2C080 80241E40 00621821 */  addu      $v1, $v1, $v0
-/* A2C084 80241E44 000318C0 */  sll       $v1, $v1, 3
-/* A2C088 80241E48 00621821 */  addu      $v1, $v1, $v0
-/* A2C08C 80241E4C 000318C0 */  sll       $v1, $v1, 3
-/* A2C090 80241E50 00640018 */  mult      $v1, $a0
-/* A2C094 80241E54 00003810 */  mfhi      $a3
-/* A2C098 80241E58 00E31021 */  addu      $v0, $a3, $v1
-/* A2C09C 80241E5C 000211C3 */  sra       $v0, $v0, 7
-/* A2C0A0 80241E60 00031FC3 */  sra       $v1, $v1, 0x1f
-/* A2C0A4 80241E64 00431023 */  subu      $v0, $v0, $v1
-/* A2C0A8 80241E68 24420093 */  addiu     $v0, $v0, 0x93
-/* A2C0AC 80241E6C 44820000 */  mtc1      $v0, $f0
-/* A2C0B0 80241E70 00000000 */  nop
-/* A2C0B4 80241E74 46800020 */  cvt.s.w   $f0, $f0
-/* A2C0B8 80241E78 28C20014 */  slti      $v0, $a2, 0x14
-/* A2C0BC 80241E7C 1040000F */  beqz      $v0, .L80241EBC
-/* A2C0C0 80241E80 E4A0003C */   swc1     $f0, 0x3c($a1)
-/* A2C0C4 80241E84 3C0141F0 */  lui       $at, 0x41f0
-/* A2C0C8 80241E88 44810000 */  mtc1      $at, $f0
-/* A2C0CC 80241E8C 44861000 */  mtc1      $a2, $f2
-/* A2C0D0 80241E90 00000000 */  nop
-/* A2C0D4 80241E94 468010A0 */  cvt.s.w   $f2, $f2
-/* A2C0D8 80241E98 46001082 */  mul.s     $f2, $f2, $f0
-/* A2C0DC 80241E9C 00000000 */  nop
-/* A2C0E0 80241EA0 3C0141A0 */  lui       $at, 0x41a0
-/* A2C0E4 80241EA4 44812000 */  mtc1      $at, $f4
-/* A2C0E8 80241EA8 3C0142E4 */  lui       $at, 0x42e4
-/* A2C0EC 80241EAC 44810000 */  mtc1      $at, $f0
-/* A2C0F0 80241EB0 46041083 */  div.s     $f2, $f2, $f4
-/* A2C0F4 80241EB4 080907B2 */  j         .L80241EC8
-/* A2C0F8 80241EB8 46020001 */   sub.s    $f0, $f0, $f2
-.L80241EBC:
-/* A2C0FC 80241EBC 3C0142A8 */  lui       $at, 0x42a8
-/* A2C100 80241EC0 44810000 */  mtc1      $at, $f0
-/* A2C104 80241EC4 00000000 */  nop
-.L80241EC8:
-/* A2C108 80241EC8 E4A00040 */  swc1      $f0, 0x40($a1)
-/* A2C10C 80241ECC C4A00038 */  lwc1      $f0, 0x38($a1)
-/* A2C110 80241ED0 C4A20040 */  lwc1      $f2, 0x40($a1)
-/* A2C114 80241ED4 E4A0006C */  swc1      $f0, 0x6c($a1)
-/* A2C118 80241ED8 080907C8 */  j         .L80241F20
-/* A2C11C 80241EDC E4A20074 */   swc1     $f2, 0x74($a1)
-.L80241EE0:
-/* A2C120 80241EE0 24C2FFD8 */  addiu     $v0, $a2, -0x28
-/* A2C124 80241EE4 3042001E */  andi      $v0, $v0, 0x1e
-/* A2C128 80241EE8 3C018025 */  lui       $at, %hi(D_80249988_A33BC8)
-/* A2C12C 80241EEC 00220821 */  addu      $at, $at, $v0
-/* A2C130 80241EF0 84229988 */  lh        $v0, %lo(D_80249988_A33BC8)($at)
-/* A2C134 80241EF4 3C013DCC */  lui       $at, 0x3dcc
-/* A2C138 80241EF8 3421CCCD */  ori       $at, $at, 0xcccd
-/* A2C13C 80241EFC 44810000 */  mtc1      $at, $f0
-/* A2C140 80241F00 44821000 */  mtc1      $v0, $f2
-/* A2C144 80241F04 00000000 */  nop
-/* A2C148 80241F08 468010A0 */  cvt.s.w   $f2, $f2
-/* A2C14C 80241F0C 46001082 */  mul.s     $f2, $f2, $f0
-/* A2C150 80241F10 00000000 */  nop
-/* A2C154 80241F14 C4A0003C */  lwc1      $f0, 0x3c($a1)
-/* A2C158 80241F18 46020000 */  add.s     $f0, $f0, $f2
-/* A2C15C 80241F1C E4A0003C */  swc1      $f0, 0x3c($a1)
-.L80241F20:
-/* A2C160 80241F20 3C048025 */  lui       $a0, %hi(D_80249984_A33BC4)
-/* A2C164 80241F24 24849984 */  addiu     $a0, $a0, %lo(D_80249984_A33BC4)
-/* A2C168 80241F28 8C830000 */  lw        $v1, ($a0)
-/* A2C16C 80241F2C C4A0003C */  lwc1      $f0, 0x3c($a1)
-/* A2C170 80241F30 24630001 */  addiu     $v1, $v1, 1
-/* A2C174 80241F34 286207D0 */  slti      $v0, $v1, 0x7d0
-/* A2C178 80241F38 E4A00070 */  swc1      $f0, 0x70($a1)
-/* A2C17C 80241F3C AC830000 */  sw        $v1, ($a0)
-/* A2C180 80241F40 8FBF0014 */  lw        $ra, 0x14($sp)
-/* A2C184 80241F44 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2C188 80241F48 38420001 */  xori      $v0, $v0, 1
-/* A2C18C 80241F4C 03E00008 */  jr        $ra
-/* A2C190 80241F50 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s
deleted file mode 100644
index d2827262d2..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s
+++ /dev/null
@@ -1,57 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241F54_A2C194
-/* A2C194 80241F54 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2C198 80241F58 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2C19C 80241F5C 00A0802D */  daddu     $s0, $a1, $zero
-/* A2C1A0 80241F60 AFBF0014 */  sw        $ra, 0x14($sp)
-/* A2C1A4 80241F64 0C0B36B0 */  jal       resolve_npc
-/* A2C1A8 80241F68 24050009 */   addiu    $a1, $zero, 9
-/* A2C1AC 80241F6C 12000011 */  beqz      $s0, .L80241FB4
-/* A2C1B0 80241F70 0040282D */   daddu    $a1, $v0, $zero
-/* A2C1B4 80241F74 3C01C311 */  lui       $at, 0xc311
-/* A2C1B8 80241F78 44810000 */  mtc1      $at, $f0
-/* A2C1BC 80241F7C 3C0142A8 */  lui       $at, 0x42a8
-/* A2C1C0 80241F80 44811000 */  mtc1      $at, $f2
-/* A2C1C4 80241F84 E4A00038 */  swc1      $f0, 0x38($a1)
-/* A2C1C8 80241F88 46000106 */  mov.s     $f4, $f0
-/* A2C1CC 80241F8C E4A20040 */  swc1      $f2, 0x40($a1)
-/* A2C1D0 80241F90 3C0142B4 */  lui       $at, 0x42b4
-/* A2C1D4 80241F94 44811000 */  mtc1      $at, $f2
-/* A2C1D8 80241F98 C4A60040 */  lwc1      $f6, 0x40($a1)
-/* A2C1DC 80241F9C 3C014313 */  lui       $at, 0x4313
-/* A2C1E0 80241FA0 44810000 */  mtc1      $at, $f0
-/* A2C1E4 80241FA4 E4A4006C */  swc1      $f4, 0x6c($a1)
-/* A2C1E8 80241FA8 E4A2000C */  swc1      $f2, 0xc($a1)
-/* A2C1EC 80241FAC E4A0003C */  swc1      $f0, 0x3c($a1)
-/* A2C1F0 80241FB0 E4A60074 */  swc1      $f6, 0x74($a1)
-.L80241FB4:
-/* A2C1F4 80241FB4 3C048025 */  lui       $a0, %hi(D_80249A48_A33C88)
-/* A2C1F8 80241FB8 24849A48 */  addiu     $a0, $a0, %lo(D_80249A48_A33C88)
-/* A2C1FC 80241FBC 8C830000 */  lw        $v1, ($a0)
-/* A2C200 80241FC0 2462FFD8 */  addiu     $v0, $v1, -0x28
-/* A2C204 80241FC4 3042001E */  andi      $v0, $v0, 0x1e
-/* A2C208 80241FC8 3C018025 */  lui       $at, %hi(D_80249A4C_A33C8C)
-/* A2C20C 80241FCC 00220821 */  addu      $at, $at, $v0
-/* A2C210 80241FD0 84229A4C */  lh        $v0, %lo(D_80249A4C_A33C8C)($at)
-/* A2C214 80241FD4 3C013DCC */  lui       $at, 0x3dcc
-/* A2C218 80241FD8 3421CCCD */  ori       $at, $at, 0xcccd
-/* A2C21C 80241FDC 44810000 */  mtc1      $at, $f0
-/* A2C220 80241FE0 44821000 */  mtc1      $v0, $f2
-/* A2C224 80241FE4 00000000 */  nop
-/* A2C228 80241FE8 468010A0 */  cvt.s.w   $f2, $f2
-/* A2C22C 80241FEC 46001082 */  mul.s     $f2, $f2, $f0
-/* A2C230 80241FF0 00000000 */  nop
-/* A2C234 80241FF4 C4A0003C */  lwc1      $f0, 0x3c($a1)
-/* A2C238 80241FF8 24630001 */  addiu     $v1, $v1, 1
-/* A2C23C 80241FFC 46020000 */  add.s     $f0, $f0, $f2
-/* A2C240 80242000 286207D0 */  slti      $v0, $v1, 0x7d0
-/* A2C244 80242004 AC830000 */  sw        $v1, ($a0)
-/* A2C248 80242008 E4A0003C */  swc1      $f0, 0x3c($a1)
-/* A2C24C 8024200C E4A00070 */  swc1      $f0, 0x70($a1)
-/* A2C250 80242010 8FBF0014 */  lw        $ra, 0x14($sp)
-/* A2C254 80242014 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2C258 80242018 38420001 */  xori      $v0, $v0, 1
-/* A2C25C 8024201C 03E00008 */  jr        $ra
-/* A2C260 80242020 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s
deleted file mode 100644
index 8cb2174757..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s
+++ /dev/null
@@ -1,52 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421E0_A2C420
-/* A2C420 802421E0 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* A2C424 802421E4 AFB20020 */  sw        $s2, 0x20($sp)
-/* A2C428 802421E8 3C128025 */  lui       $s2, %hi(D_80249A74_A33CB4)
-/* A2C42C 802421EC 26529A74 */  addiu     $s2, $s2, %lo(D_80249A74_A33CB4)
-/* A2C430 802421F0 3C03800B */  lui       $v1, %hi(gCameras)
-/* A2C434 802421F4 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A2C438 802421F8 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2C43C 802421FC 3C118025 */  lui       $s1, %hi(D_80249A78_A33CB8)
-/* A2C440 80242200 26319A78 */  addiu     $s1, $s1, %lo(D_80249A78_A33CB8)
-/* A2C444 80242204 3C0141A0 */  lui       $at, 0x41a0
-/* A2C448 80242208 44810000 */  mtc1      $at, $f0
-/* A2C44C 8024220C 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
-/* A2C450 80242210 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
-/* A2C454 80242214 3C0542B4 */  lui       $a1, 0x42b4
-/* A2C458 80242218 3C0643ED */  lui       $a2, 0x43ed
-/* A2C45C 8024221C 34C6599A */  ori       $a2, $a2, 0x599a
-/* A2C460 80242220 24040004 */  addiu     $a0, $zero, 4
-/* A2C464 80242224 AFBF0024 */  sw        $ra, 0x24($sp)
-/* A2C468 80242228 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2C46C 8024222C AFB20014 */  sw        $s2, 0x14($sp)
-/* A2C470 80242230 00028080 */  sll       $s0, $v0, 2
-/* A2C474 80242234 02028021 */  addu      $s0, $s0, $v0
-/* A2C478 80242238 00108080 */  sll       $s0, $s0, 2
-/* A2C47C 8024223C 02028023 */  subu      $s0, $s0, $v0
-/* A2C480 80242240 001010C0 */  sll       $v0, $s0, 3
-/* A2C484 80242244 02028021 */  addu      $s0, $s0, $v0
-/* A2C488 80242248 001080C0 */  sll       $s0, $s0, 3
-/* A2C48C 8024224C E7A00010 */  swc1      $f0, 0x10($sp)
-/* A2C490 80242250 C6200000 */  lwc1      $f0, ($s1)
-/* A2C494 80242254 46800020 */  cvt.s.w   $f0, $f0
-/* A2C498 80242258 44070000 */  mfc1      $a3, $f0
-/* A2C49C 8024225C 0C090439 */  jal       func_802410E4_A2B324
-/* A2C4A0 80242260 02038021 */   addu     $s0, $s0, $v1
-/* A2C4A4 80242264 C6400000 */  lwc1      $f0, ($s2)
-/* A2C4A8 80242268 8E220000 */  lw        $v0, ($s1)
-/* A2C4AC 8024226C 24030001 */  addiu     $v1, $zero, 1
-/* A2C4B0 80242270 A6030506 */  sh        $v1, 0x506($s0)
-/* A2C4B4 80242274 24420001 */  addiu     $v0, $v0, 1
-/* A2C4B8 80242278 E60004DC */  swc1      $f0, 0x4dc($s0)
-/* A2C4BC 8024227C AE220000 */  sw        $v0, ($s1)
-/* A2C4C0 80242280 28420015 */  slti      $v0, $v0, 0x15
-/* A2C4C4 80242284 8FBF0024 */  lw        $ra, 0x24($sp)
-/* A2C4C8 80242288 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2C4CC 8024228C 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2C4D0 80242290 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2C4D4 80242294 38420001 */  xori      $v0, $v0, 1
-/* A2C4D8 80242298 03E00008 */  jr        $ra
-/* A2C4DC 8024229C 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s
deleted file mode 100644
index 462b45f46d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s
+++ /dev/null
@@ -1,82 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422A0_A2C4E0
-/* A2C4E0 802422A0 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* A2C4E4 802422A4 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2C4E8 802422A8 0080802D */  daddu     $s0, $a0, $zero
-/* A2C4EC 802422AC AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2C4F0 802422B0 00A0882D */  daddu     $s1, $a1, $zero
-/* A2C4F4 802422B4 AFBF0028 */  sw        $ra, 0x28($sp)
-/* A2C4F8 802422B8 AFB30024 */  sw        $s3, 0x24($sp)
-/* A2C4FC 802422BC AFB20020 */  sw        $s2, 0x20($sp)
-/* A2C500 802422C0 F7B60038 */  sdc1      $f22, 0x38($sp)
-/* A2C504 802422C4 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* A2C508 802422C8 0C0B36B0 */  jal       resolve_npc
-/* A2C50C 802422CC 24050007 */   addiu    $a1, $zero, 7
-/* A2C510 802422D0 0200202D */  daddu     $a0, $s0, $zero
-/* A2C514 802422D4 24050008 */  addiu     $a1, $zero, 8
-/* A2C518 802422D8 0C0B36B0 */  jal       resolve_npc
-/* A2C51C 802422DC 0040902D */   daddu    $s2, $v0, $zero
-/* A2C520 802422E0 12200007 */  beqz      $s1, .L80242300
-/* A2C524 802422E4 0040982D */   daddu    $s3, $v0, $zero
-/* A2C528 802422E8 C6400038 */  lwc1      $f0, 0x38($s2)
-/* A2C52C 802422EC C6420040 */  lwc1      $f2, 0x40($s2)
-/* A2C530 802422F0 3C018025 */  lui       $at, %hi(D_8024F2D8)
-/* A2C534 802422F4 E420F2D8 */  swc1      $f0, %lo(D_8024F2D8)($at)
-/* A2C538 802422F8 3C018025 */  lui       $at, %hi(D_8024F2DC)
-/* A2C53C 802422FC E422F2DC */  swc1      $f2, %lo(D_8024F2DC)($at)
-.L80242300:
-/* A2C540 80242300 24040003 */  addiu     $a0, $zero, 3
-/* A2C544 80242304 3C108025 */  lui       $s0, %hi(D_80249A7C_A33CBC)
-/* A2C548 80242308 26109A7C */  addiu     $s0, $s0, %lo(D_80249A7C_A33CBC)
-/* A2C54C 8024230C C6000000 */  lwc1      $f0, ($s0)
-/* A2C550 80242310 46800020 */  cvt.s.w   $f0, $f0
-/* A2C554 80242314 3C058025 */  lui       $a1, %hi(D_8024F2D8)
-/* A2C558 80242318 8CA5F2D8 */  lw        $a1, %lo(D_8024F2D8)($a1)
-/* A2C55C 8024231C 4480A000 */  mtc1      $zero, $f20
-/* A2C560 80242320 44070000 */  mfc1      $a3, $f0
-/* A2C564 80242324 3C014220 */  lui       $at, 0x4220
-/* A2C568 80242328 4481B000 */  mtc1      $at, $f22
-/* A2C56C 8024232C 4406A000 */  mfc1      $a2, $f20
-/* A2C570 80242330 26420038 */  addiu     $v0, $s2, 0x38
-/* A2C574 80242334 AFA20014 */  sw        $v0, 0x14($sp)
-/* A2C578 80242338 0C090439 */  jal       func_802410E4_A2B324
-/* A2C57C 8024233C E7B60010 */   swc1     $f22, 0x10($sp)
-/* A2C580 80242340 C6000000 */  lwc1      $f0, ($s0)
-/* A2C584 80242344 46800020 */  cvt.s.w   $f0, $f0
-/* A2C588 80242348 24040003 */  addiu     $a0, $zero, 3
-/* A2C58C 8024234C 3C058025 */  lui       $a1, %hi(D_8024F2DC)
-/* A2C590 80242350 8CA5F2DC */  lw        $a1, %lo(D_8024F2DC)($a1)
-/* A2C594 80242354 4406A000 */  mfc1      $a2, $f20
-/* A2C598 80242358 44070000 */  mfc1      $a3, $f0
-/* A2C59C 8024235C 26420040 */  addiu     $v0, $s2, 0x40
-/* A2C5A0 80242360 E7B60010 */  swc1      $f22, 0x10($sp)
-/* A2C5A4 80242364 0C090439 */  jal       func_802410E4_A2B324
-/* A2C5A8 80242368 AFA20014 */   sw       $v0, 0x14($sp)
-/* A2C5AC 8024236C C6400038 */  lwc1      $f0, 0x38($s2)
-/* A2C5B0 80242370 E6600038 */  swc1      $f0, 0x38($s3)
-/* A2C5B4 80242374 C6400040 */  lwc1      $f0, 0x40($s2)
-/* A2C5B8 80242378 E6600040 */  swc1      $f0, 0x40($s3)
-/* A2C5BC 8024237C C6400038 */  lwc1      $f0, 0x38($s2)
-/* A2C5C0 80242380 8E030000 */  lw        $v1, ($s0)
-/* A2C5C4 80242384 C6420040 */  lwc1      $f2, 0x40($s2)
-/* A2C5C8 80242388 24630001 */  addiu     $v1, $v1, 1
-/* A2C5CC 8024238C E640006C */  swc1      $f0, 0x6c($s2)
-/* A2C5D0 80242390 E6420074 */  swc1      $f2, 0x74($s2)
-/* A2C5D4 80242394 C6600038 */  lwc1      $f0, 0x38($s3)
-/* A2C5D8 80242398 C6620040 */  lwc1      $f2, 0x40($s3)
-/* A2C5DC 8024239C 28620029 */  slti      $v0, $v1, 0x29
-/* A2C5E0 802423A0 AE030000 */  sw        $v1, ($s0)
-/* A2C5E4 802423A4 E660006C */  swc1      $f0, 0x6c($s3)
-/* A2C5E8 802423A8 E6620074 */  swc1      $f2, 0x74($s3)
-/* A2C5EC 802423AC 8FBF0028 */  lw        $ra, 0x28($sp)
-/* A2C5F0 802423B0 8FB30024 */  lw        $s3, 0x24($sp)
-/* A2C5F4 802423B4 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2C5F8 802423B8 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2C5FC 802423BC 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2C600 802423C0 D7B60038 */  ldc1      $f22, 0x38($sp)
-/* A2C604 802423C4 D7B40030 */  ldc1      $f20, 0x30($sp)
-/* A2C608 802423C8 38420001 */  xori      $v0, $v0, 1
-/* A2C60C 802423CC 03E00008 */  jr        $ra
-/* A2C610 802423D0 27BD0040 */   addiu    $sp, $sp, 0x40
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s
deleted file mode 100644
index 193082d257..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s
+++ /dev/null
@@ -1,119 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802423D4_A2C614
-/* A2C614 802423D4 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* A2C618 802423D8 24040004 */  addiu     $a0, $zero, 4
-/* A2C61C 802423DC AFB20020 */  sw        $s2, 0x20($sp)
-/* A2C620 802423E0 3C128025 */  lui       $s2, %hi(D_80249A80_A33CC0)
-/* A2C624 802423E4 26529A80 */  addiu     $s2, $s2, %lo(D_80249A80_A33CC0)
-/* A2C628 802423E8 AFBF0034 */  sw        $ra, 0x34($sp)
-/* A2C62C 802423EC AFB60030 */  sw        $s6, 0x30($sp)
-/* A2C630 802423F0 AFB5002C */  sw        $s5, 0x2c($sp)
-/* A2C634 802423F4 AFB40028 */  sw        $s4, 0x28($sp)
-/* A2C638 802423F8 AFB30024 */  sw        $s3, 0x24($sp)
-/* A2C63C 802423FC AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2C640 80242400 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2C644 80242404 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* A2C648 80242408 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* A2C64C 8024240C C6400000 */  lwc1      $f0, ($s2)
-/* A2C650 80242410 46800020 */  cvt.s.w   $f0, $f0
-/* A2C654 80242414 3C168025 */  lui       $s6, %hi(D_8024F2E0)
-/* A2C658 80242418 26D6F2E0 */  addiu     $s6, $s6, %lo(D_8024F2E0)
-/* A2C65C 8024241C 3C01420C */  lui       $at, 0x420c
-/* A2C660 80242420 44811000 */  mtc1      $at, $f2
-/* A2C664 80242424 44070000 */  mfc1      $a3, $f0
-/* A2C668 80242428 3C0142A0 */  lui       $at, 0x42a0
-/* A2C66C 8024242C 4481A000 */  mtc1      $at, $f20
-/* A2C670 80242430 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
-/* A2C674 80242434 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
-/* A2C678 80242438 3C03800B */  lui       $v1, %hi(gCameras)
-/* A2C67C 8024243C 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A2C680 80242440 AFB60014 */  sw        $s6, 0x14($sp)
-/* A2C684 80242444 00028080 */  sll       $s0, $v0, 2
-/* A2C688 80242448 02028021 */  addu      $s0, $s0, $v0
-/* A2C68C 8024244C 00108080 */  sll       $s0, $s0, 2
-/* A2C690 80242450 02028023 */  subu      $s0, $s0, $v0
-/* A2C694 80242454 001010C0 */  sll       $v0, $s0, 3
-/* A2C698 80242458 02028021 */  addu      $s0, $s0, $v0
-/* A2C69C 8024245C 001080C0 */  sll       $s0, $s0, 3
-/* A2C6A0 80242460 44051000 */  mfc1      $a1, $f2
-/* A2C6A4 80242464 02038021 */  addu      $s0, $s0, $v1
-/* A2C6A8 80242468 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2C6AC 8024246C 0C090439 */  jal       func_802410E4_A2B324
-/* A2C6B0 80242470 00A0302D */   daddu    $a2, $a1, $zero
-/* A2C6B4 80242474 C6400000 */  lwc1      $f0, ($s2)
-/* A2C6B8 80242478 46800020 */  cvt.s.w   $f0, $f0
-/* A2C6BC 8024247C 24040004 */  addiu     $a0, $zero, 4
-/* A2C6C0 80242480 3C054302 */  lui       $a1, 0x4302
-/* A2C6C4 80242484 3C064387 */  lui       $a2, 0x4387
-/* A2C6C8 80242488 44070000 */  mfc1      $a3, $f0
-/* A2C6CC 8024248C 3C158025 */  lui       $s5, %hi(D_8024F2E4)
-/* A2C6D0 80242490 26B5F2E4 */  addiu     $s5, $s5, %lo(D_8024F2E4)
-/* A2C6D4 80242494 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2C6D8 80242498 0C090439 */  jal       func_802410E4_A2B324
-/* A2C6DC 8024249C AFB50014 */   sw       $s5, 0x14($sp)
-/* A2C6E0 802424A0 C6400000 */  lwc1      $f0, ($s2)
-/* A2C6E4 802424A4 46800020 */  cvt.s.w   $f0, $f0
-/* A2C6E8 802424A8 24040004 */  addiu     $a0, $zero, 4
-/* A2C6EC 802424AC 4480B000 */  mtc1      $zero, $f22
-/* A2C6F0 802424B0 3C0541F0 */  lui       $a1, 0x41f0
-/* A2C6F4 802424B4 44070000 */  mfc1      $a3, $f0
-/* A2C6F8 802424B8 4406B000 */  mfc1      $a2, $f22
-/* A2C6FC 802424BC 3C148025 */  lui       $s4, %hi(D_8024F2E8)
-/* A2C700 802424C0 2694F2E8 */  addiu     $s4, $s4, %lo(D_8024F2E8)
-/* A2C704 802424C4 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2C708 802424C8 0C090439 */  jal       func_802410E4_A2B324
-/* A2C70C 802424CC AFB40014 */   sw       $s4, 0x14($sp)
-/* A2C710 802424D0 C6400000 */  lwc1      $f0, ($s2)
-/* A2C714 802424D4 46800020 */  cvt.s.w   $f0, $f0
-/* A2C718 802424D8 24040004 */  addiu     $a0, $zero, 4
-/* A2C71C 802424DC 3C054368 */  lui       $a1, 0x4368
-/* A2C720 802424E0 3C064331 */  lui       $a2, 0x4331
-/* A2C724 802424E4 44070000 */  mfc1      $a3, $f0
-/* A2C728 802424E8 3C138025 */  lui       $s3, %hi(D_8024F2EC)
-/* A2C72C 802424EC 2673F2EC */  addiu     $s3, $s3, %lo(D_8024F2EC)
-/* A2C730 802424F0 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2C734 802424F4 0C090439 */  jal       func_802410E4_A2B324
-/* A2C738 802424F8 AFB30014 */   sw       $s3, 0x14($sp)
-/* A2C73C 802424FC C6400000 */  lwc1      $f0, ($s2)
-/* A2C740 80242500 46800020 */  cvt.s.w   $f0, $f0
-/* A2C744 80242504 24040004 */  addiu     $a0, $zero, 4
-/* A2C748 80242508 4405B000 */  mfc1      $a1, $f22
-/* A2C74C 8024250C 44070000 */  mfc1      $a3, $f0
-/* A2C750 80242510 3C118025 */  lui       $s1, %hi(D_8024F2F0_C0CB70)
-/* A2C754 80242514 2631F2F0 */  addiu     $s1, $s1, %lo(D_8024F2F0_C0CB70)
-/* A2C758 80242518 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2C75C 8024251C AFB10014 */  sw        $s1, 0x14($sp)
-/* A2C760 80242520 0C090439 */  jal       func_802410E4_A2B324
-/* A2C764 80242524 00A0302D */   daddu    $a2, $a1, $zero
-/* A2C768 80242528 8EC50000 */  lw        $a1, ($s6)
-/* A2C76C 8024252C 0C090355 */  jal       func_80240D54_A2AF94
-/* A2C770 80242530 0000202D */   daddu    $a0, $zero, $zero
-/* A2C774 80242534 C6A00000 */  lwc1      $f0, ($s5)
-/* A2C778 80242538 C6820000 */  lwc1      $f2, ($s4)
-/* A2C77C 8024253C C6640000 */  lwc1      $f4, ($s3)
-/* A2C780 80242540 C6260000 */  lwc1      $f6, ($s1)
-/* A2C784 80242544 8E420000 */  lw        $v0, ($s2)
-/* A2C788 80242548 24030001 */  addiu     $v1, $zero, 1
-/* A2C78C 8024254C A6030506 */  sh        $v1, 0x506($s0)
-/* A2C790 80242550 24420001 */  addiu     $v0, $v0, 1
-/* A2C794 80242554 E60004DC */  swc1      $f0, 0x4dc($s0)
-/* A2C798 80242558 E60204B0 */  swc1      $f2, 0x4b0($s0)
-/* A2C79C 8024255C E60404B4 */  swc1      $f4, 0x4b4($s0)
-/* A2C7A0 80242560 E60604B8 */  swc1      $f6, 0x4b8($s0)
-/* A2C7A4 80242564 AE420000 */  sw        $v0, ($s2)
-/* A2C7A8 80242568 2842005B */  slti      $v0, $v0, 0x5b
-/* A2C7AC 8024256C 8FBF0034 */  lw        $ra, 0x34($sp)
-/* A2C7B0 80242570 8FB60030 */  lw        $s6, 0x30($sp)
-/* A2C7B4 80242574 8FB5002C */  lw        $s5, 0x2c($sp)
-/* A2C7B8 80242578 8FB40028 */  lw        $s4, 0x28($sp)
-/* A2C7BC 8024257C 8FB30024 */  lw        $s3, 0x24($sp)
-/* A2C7C0 80242580 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2C7C4 80242584 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2C7C8 80242588 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2C7CC 8024258C D7B60040 */  ldc1      $f22, 0x40($sp)
-/* A2C7D0 80242590 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* A2C7D4 80242594 38420001 */  xori      $v0, $v0, 1
-/* A2C7D8 80242598 03E00008 */  jr        $ra
-/* A2C7DC 8024259C 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s
deleted file mode 100644
index 74171b5a09..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s
+++ /dev/null
@@ -1,93 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802425A0_A2C7E0
-/* A2C7E0 802425A0 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* A2C7E4 802425A4 0000202D */  daddu     $a0, $zero, $zero
-/* A2C7E8 802425A8 AFB20020 */  sw        $s2, 0x20($sp)
-/* A2C7EC 802425AC 3C128025 */  lui       $s2, %hi(D_80249A90_A33CD0)
-/* A2C7F0 802425B0 26529A90 */  addiu     $s2, $s2, %lo(D_80249A90_A33CD0)
-/* A2C7F4 802425B4 AFBF002C */  sw        $ra, 0x2c($sp)
-/* A2C7F8 802425B8 AFB40028 */  sw        $s4, 0x28($sp)
-/* A2C7FC 802425BC AFB30024 */  sw        $s3, 0x24($sp)
-/* A2C800 802425C0 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2C804 802425C4 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2C808 802425C8 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* A2C80C 802425CC C6400000 */  lwc1      $f0, ($s2)
-/* A2C810 802425D0 46800020 */  cvt.s.w   $f0, $f0
-/* A2C814 802425D4 3C148025 */  lui       $s4, %hi(D_80249A84_A33CC4)
-/* A2C818 802425D8 26949A84 */  addiu     $s4, $s4, %lo(D_80249A84_A33CC4)
-/* A2C81C 802425DC 3C054220 */  lui       $a1, 0x4220
-/* A2C820 802425E0 3C06C302 */  lui       $a2, 0xc302
-/* A2C824 802425E4 44070000 */  mfc1      $a3, $f0
-/* A2C828 802425E8 3C01432A */  lui       $at, 0x432a
-/* A2C82C 802425EC 4481A000 */  mtc1      $at, $f20
-/* A2C830 802425F0 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
-/* A2C834 802425F4 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
-/* A2C838 802425F8 3C03800B */  lui       $v1, %hi(gCameras)
-/* A2C83C 802425FC 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A2C840 80242600 AFB40014 */  sw        $s4, 0x14($sp)
-/* A2C844 80242604 00028080 */  sll       $s0, $v0, 2
-/* A2C848 80242608 02028021 */  addu      $s0, $s0, $v0
-/* A2C84C 8024260C 00108080 */  sll       $s0, $s0, 2
-/* A2C850 80242610 02028023 */  subu      $s0, $s0, $v0
-/* A2C854 80242614 001010C0 */  sll       $v0, $s0, 3
-/* A2C858 80242618 02028021 */  addu      $s0, $s0, $v0
-/* A2C85C 8024261C 001080C0 */  sll       $s0, $s0, 3
-/* A2C860 80242620 02038021 */  addu      $s0, $s0, $v1
-/* A2C864 80242624 0C090439 */  jal       func_802410E4_A2B324
-/* A2C868 80242628 E7B40010 */   swc1     $f20, 0x10($sp)
-/* A2C86C 8024262C C6400000 */  lwc1      $f0, ($s2)
-/* A2C870 80242630 46800020 */  cvt.s.w   $f0, $f0
-/* A2C874 80242634 0000202D */  daddu     $a0, $zero, $zero
-/* A2C878 80242638 3C05C220 */  lui       $a1, 0xc220
-/* A2C87C 8024263C 3C064302 */  lui       $a2, 0x4302
-/* A2C880 80242640 44070000 */  mfc1      $a3, $f0
-/* A2C884 80242644 3C138025 */  lui       $s3, %hi(D_80249A88_A33CC8)
-/* A2C888 80242648 26739A88 */  addiu     $s3, $s3, %lo(D_80249A88_A33CC8)
-/* A2C88C 8024264C E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2C890 80242650 0C090439 */  jal       func_802410E4_A2B324
-/* A2C894 80242654 AFB30014 */   sw       $s3, 0x14($sp)
-/* A2C898 80242658 C6400000 */  lwc1      $f0, ($s2)
-/* A2C89C 8024265C 46800020 */  cvt.s.w   $f0, $f0
-/* A2C8A0 80242660 24040003 */  addiu     $a0, $zero, 3
-/* A2C8A4 80242664 3C054234 */  lui       $a1, 0x4234
-/* A2C8A8 80242668 3C0641C8 */  lui       $a2, 0x41c8
-/* A2C8AC 8024266C 44070000 */  mfc1      $a3, $f0
-/* A2C8B0 80242670 3C118025 */  lui       $s1, %hi(D_80249A8C_A33CCC)
-/* A2C8B4 80242674 26319A8C */  addiu     $s1, $s1, %lo(D_80249A8C_A33CCC)
-/* A2C8B8 80242678 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2C8BC 8024267C 0C090439 */  jal       func_802410E4_A2B324
-/* A2C8C0 80242680 AFB10014 */   sw       $s1, 0x14($sp)
-/* A2C8C4 80242684 C62C0000 */  lwc1      $f12, ($s1)
-/* A2C8C8 80242688 C6800000 */  lwc1      $f0, ($s4)
-/* A2C8CC 8024268C C6620000 */  lwc1      $f2, ($s3)
-/* A2C8D0 80242690 3C0143FA */  lui       $at, 0x43fa
-/* A2C8D4 80242694 4481A000 */  mtc1      $at, $f20
-/* A2C8D8 80242698 24020001 */  addiu     $v0, $zero, 1
-/* A2C8DC 8024269C A6020506 */  sh        $v0, 0x506($s0)
-/* A2C8E0 802426A0 E60004B0 */  swc1      $f0, 0x4b0($s0)
-/* A2C8E4 802426A4 0C00A8BB */  jal       sin_deg
-/* A2C8E8 802426A8 E60204B8 */   swc1     $f2, 0x4b8($s0)
-/* A2C8EC 802426AC 46140002 */  mul.s     $f0, $f0, $f20
-/* A2C8F0 802426B0 00000000 */  nop
-/* A2C8F4 802426B4 C62C0000 */  lwc1      $f12, ($s1)
-/* A2C8F8 802426B8 0C00A8D4 */  jal       cos_deg
-/* A2C8FC 802426BC E60004F0 */   swc1     $f0, 0x4f0($s0)
-/* A2C900 802426C0 46140002 */  mul.s     $f0, $f0, $f20
-/* A2C904 802426C4 00000000 */  nop
-/* A2C908 802426C8 8E420000 */  lw        $v0, ($s2)
-/* A2C90C 802426CC 24420001 */  addiu     $v0, $v0, 1
-/* A2C910 802426D0 AE420000 */  sw        $v0, ($s2)
-/* A2C914 802426D4 384200AA */  xori      $v0, $v0, 0xaa
-/* A2C918 802426D8 E60004F8 */  swc1      $f0, 0x4f8($s0)
-/* A2C91C 802426DC 8FBF002C */  lw        $ra, 0x2c($sp)
-/* A2C920 802426E0 8FB40028 */  lw        $s4, 0x28($sp)
-/* A2C924 802426E4 8FB30024 */  lw        $s3, 0x24($sp)
-/* A2C928 802426E8 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2C92C 802426EC 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2C930 802426F0 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2C934 802426F4 D7B40030 */  ldc1      $f20, 0x30($sp)
-/* A2C938 802426F8 2C420001 */  sltiu     $v0, $v0, 1
-/* A2C93C 802426FC 03E00008 */  jr        $ra
-/* A2C940 80242700 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s
deleted file mode 100644
index 2f090bae4f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s
+++ /dev/null
@@ -1,117 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242704_A2C944
-/* A2C944 80242704 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* A2C948 80242708 24040003 */  addiu     $a0, $zero, 3
-/* A2C94C 8024270C AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2C950 80242710 3C118025 */  lui       $s1, %hi(D_80249AA4_A33CE4)
-/* A2C954 80242714 26319AA4 */  addiu     $s1, $s1, %lo(D_80249AA4_A33CE4)
-/* A2C958 80242718 AFBF0030 */  sw        $ra, 0x30($sp)
-/* A2C95C 8024271C AFB5002C */  sw        $s5, 0x2c($sp)
-/* A2C960 80242720 AFB40028 */  sw        $s4, 0x28($sp)
-/* A2C964 80242724 AFB30024 */  sw        $s3, 0x24($sp)
-/* A2C968 80242728 AFB20020 */  sw        $s2, 0x20($sp)
-/* A2C96C 8024272C AFB00018 */  sw        $s0, 0x18($sp)
-/* A2C970 80242730 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* A2C974 80242734 F7B40038 */  sdc1      $f20, 0x38($sp)
-/* A2C978 80242738 C6200000 */  lwc1      $f0, ($s1)
-/* A2C97C 8024273C 46800020 */  cvt.s.w   $f0, $f0
-/* A2C980 80242740 3C138025 */  lui       $s3, %hi(D_80249AA0_A33CE0)
-/* A2C984 80242744 26739AA0 */  addiu     $s3, $s3, %lo(D_80249AA0_A33CE0)
-/* A2C988 80242748 3C0541C8 */  lui       $a1, 0x41c8
-/* A2C98C 8024274C 3C014348 */  lui       $at, 0x4348
-/* A2C990 80242750 4481B000 */  mtc1      $at, $f22
-/* A2C994 80242754 44070000 */  mfc1      $a3, $f0
-/* A2C998 80242758 3C0142F0 */  lui       $at, 0x42f0
-/* A2C99C 8024275C 44810000 */  mtc1      $at, $f0
-/* A2C9A0 80242760 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
-/* A2C9A4 80242764 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
-/* A2C9A8 80242768 3C03800B */  lui       $v1, %hi(gCameras)
-/* A2C9AC 8024276C 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A2C9B0 80242770 AFB30014 */  sw        $s3, 0x14($sp)
-/* A2C9B4 80242774 00028080 */  sll       $s0, $v0, 2
-/* A2C9B8 80242778 02028021 */  addu      $s0, $s0, $v0
-/* A2C9BC 8024277C 00108080 */  sll       $s0, $s0, 2
-/* A2C9C0 80242780 02028023 */  subu      $s0, $s0, $v0
-/* A2C9C4 80242784 00901004 */  sllv      $v0, $s0, $a0
-/* A2C9C8 80242788 02028021 */  addu      $s0, $s0, $v0
-/* A2C9CC 8024278C 00908004 */  sllv      $s0, $s0, $a0
-/* A2C9D0 80242790 4406B000 */  mfc1      $a2, $f22
-/* A2C9D4 80242794 02038021 */  addu      $s0, $s0, $v1
-/* A2C9D8 80242798 0C090439 */  jal       func_802410E4_A2B324
-/* A2C9DC 8024279C E7A00010 */   swc1     $f0, 0x10($sp)
-/* A2C9E0 802427A0 C6200000 */  lwc1      $f0, ($s1)
-/* A2C9E4 802427A4 46800020 */  cvt.s.w   $f0, $f0
-/* A2C9E8 802427A8 24040003 */  addiu     $a0, $zero, 3
-/* A2C9EC 802427AC 3C054248 */  lui       $a1, 0x4248
-/* A2C9F0 802427B0 3C06420C */  lui       $a2, 0x420c
-/* A2C9F4 802427B4 44070000 */  mfc1      $a3, $f0
-/* A2C9F8 802427B8 3C0141F0 */  lui       $at, 0x41f0
-/* A2C9FC 802427BC 4481A000 */  mtc1      $at, $f20
-/* A2CA00 802427C0 3C158025 */  lui       $s5, %hi(D_80249A94_A33CD4)
-/* A2CA04 802427C4 26B59A94 */  addiu     $s5, $s5, %lo(D_80249A94_A33CD4)
-/* A2CA08 802427C8 AFB50014 */  sw        $s5, 0x14($sp)
-/* A2CA0C 802427CC 0C090439 */  jal       func_802410E4_A2B324
-/* A2CA10 802427D0 E7B40010 */   swc1     $f20, 0x10($sp)
-/* A2CA14 802427D4 C6200000 */  lwc1      $f0, ($s1)
-/* A2CA18 802427D8 46800020 */  cvt.s.w   $f0, $f0
-/* A2CA1C 802427DC 24040003 */  addiu     $a0, $zero, 3
-/* A2CA20 802427E0 3C054376 */  lui       $a1, 0x4376
-/* A2CA24 802427E4 34A5199A */  ori       $a1, $a1, 0x199a
-/* A2CA28 802427E8 3C064334 */  lui       $a2, 0x4334
-/* A2CA2C 802427EC 44070000 */  mfc1      $a3, $f0
-/* A2CA30 802427F0 3C148025 */  lui       $s4, %hi(D_80249A98_A33CD8)
-/* A2CA34 802427F4 26949A98 */  addiu     $s4, $s4, %lo(D_80249A98_A33CD8)
-/* A2CA38 802427F8 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2CA3C 802427FC 0C090439 */  jal       func_802410E4_A2B324
-/* A2CA40 80242800 AFB40014 */   sw       $s4, 0x14($sp)
-/* A2CA44 80242804 C6200000 */  lwc1      $f0, ($s1)
-/* A2CA48 80242808 46800020 */  cvt.s.w   $f0, $f0
-/* A2CA4C 8024280C 24040003 */  addiu     $a0, $zero, 3
-/* A2CA50 80242810 4405B000 */  mfc1      $a1, $f22
-/* A2CA54 80242814 3C06435C */  lui       $a2, 0x435c
-/* A2CA58 80242818 44070000 */  mfc1      $a3, $f0
-/* A2CA5C 8024281C 3C128025 */  lui       $s2, %hi(D_80249A9C_A33CDC)
-/* A2CA60 80242820 26529A9C */  addiu     $s2, $s2, %lo(D_80249A9C_A33CDC)
-/* A2CA64 80242824 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2CA68 80242828 0C090439 */  jal       func_802410E4_A2B324
-/* A2CA6C 8024282C AFB20014 */   sw       $s2, 0x14($sp)
-/* A2CA70 80242830 C66C0000 */  lwc1      $f12, ($s3)
-/* A2CA74 80242834 3C0143FA */  lui       $at, 0x43fa
-/* A2CA78 80242838 4481A000 */  mtc1      $at, $f20
-/* A2CA7C 8024283C 0C00A8BB */  jal       sin_deg
-/* A2CA80 80242840 00000000 */   nop
-/* A2CA84 80242844 46140002 */  mul.s     $f0, $f0, $f20
-/* A2CA88 80242848 00000000 */  nop
-/* A2CA8C 8024284C C66C0000 */  lwc1      $f12, ($s3)
-/* A2CA90 80242850 0C00A8D4 */  jal       cos_deg
-/* A2CA94 80242854 E60004F0 */   swc1     $f0, 0x4f0($s0)
-/* A2CA98 80242858 46140002 */  mul.s     $f0, $f0, $f20
-/* A2CA9C 8024285C 00000000 */  nop
-/* A2CAA0 80242860 8EA50000 */  lw        $a1, ($s5)
-/* A2CAA4 80242864 0000202D */  daddu     $a0, $zero, $zero
-/* A2CAA8 80242868 0C090355 */  jal       func_80240D54_A2AF94
-/* A2CAAC 8024286C E60004F8 */   swc1     $f0, 0x4f8($s0)
-/* A2CAB0 80242870 C6800000 */  lwc1      $f0, ($s4)
-/* A2CAB4 80242874 C6420000 */  lwc1      $f2, ($s2)
-/* A2CAB8 80242878 8E220000 */  lw        $v0, ($s1)
-/* A2CABC 8024287C 24030001 */  addiu     $v1, $zero, 1
-/* A2CAC0 80242880 A6030506 */  sh        $v1, 0x506($s0)
-/* A2CAC4 80242884 24420001 */  addiu     $v0, $v0, 1
-/* A2CAC8 80242888 E60004DC */  swc1      $f0, 0x4dc($s0)
-/* A2CACC 8024288C E60204B4 */  swc1      $f2, 0x4b4($s0)
-/* A2CAD0 80242890 AE220000 */  sw        $v0, ($s1)
-/* A2CAD4 80242894 28420079 */  slti      $v0, $v0, 0x79
-/* A2CAD8 80242898 8FBF0030 */  lw        $ra, 0x30($sp)
-/* A2CADC 8024289C 8FB5002C */  lw        $s5, 0x2c($sp)
-/* A2CAE0 802428A0 8FB40028 */  lw        $s4, 0x28($sp)
-/* A2CAE4 802428A4 8FB30024 */  lw        $s3, 0x24($sp)
-/* A2CAE8 802428A8 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2CAEC 802428AC 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2CAF0 802428B0 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2CAF4 802428B4 D7B60040 */  ldc1      $f22, 0x40($sp)
-/* A2CAF8 802428B8 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* A2CAFC 802428BC 38420001 */  xori      $v0, $v0, 1
-/* A2CB00 802428C0 03E00008 */  jr        $ra
-/* A2CB04 802428C4 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s
deleted file mode 100644
index 829835bba6..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s
+++ /dev/null
@@ -1,47 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242F74_A2D1B4
-/* A2D1B4 80242F74 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* A2D1B8 80242F78 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2D1BC 80242F7C 3C118025 */  lui       $s1, %hi(D_8024A9C8_A34C08)
-/* A2D1C0 80242F80 2631A9C8 */  addiu     $s1, $s1, %lo(D_8024A9C8_A34C08)
-/* A2D1C4 80242F84 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
-/* A2D1C8 80242F88 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
-/* A2D1CC 80242F8C 3C018025 */  lui       $at, %hi(D_8024987C_A33ABC)
-/* A2D1D0 80242F90 C42C987C */  lwc1      $f12, %lo(D_8024987C_A33ABC)($at)
-/* A2D1D4 80242F94 3C018025 */  lui       $at, %hi(D_802498A8_A33AE8)
-/* A2D1D8 80242F98 C42E98A8 */  lwc1      $f14, %lo(D_802498A8_A33AE8)($at)
-/* A2D1DC 80242F9C 3C03800B */  lui       $v1, %hi(gCameras)
-/* A2D1E0 80242FA0 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A2D1E4 80242FA4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* A2D1E8 80242FA8 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2D1EC 80242FAC AFB10010 */  sw        $s1, 0x10($sp)
-/* A2D1F0 80242FB0 8E260000 */  lw        $a2, ($s1)
-/* A2D1F4 80242FB4 3C073F80 */  lui       $a3, 0x3f80
-/* A2D1F8 80242FB8 00028080 */  sll       $s0, $v0, 2
-/* A2D1FC 80242FBC 02028021 */  addu      $s0, $s0, $v0
-/* A2D200 80242FC0 00108080 */  sll       $s0, $s0, 2
-/* A2D204 80242FC4 02028023 */  subu      $s0, $s0, $v0
-/* A2D208 80242FC8 001010C0 */  sll       $v0, $s0, 3
-/* A2D20C 80242FCC 02028021 */  addu      $s0, $s0, $v0
-/* A2D210 80242FD0 001080C0 */  sll       $s0, $s0, 3
-/* A2D214 80242FD4 0C090411 */  jal       func_80241044_A2B284
-/* A2D218 80242FD8 02038021 */   addu     $s0, $s0, $v1
-/* A2D21C 80242FDC 24020001 */  addiu     $v0, $zero, 1
-/* A2D220 80242FE0 C6200000 */  lwc1      $f0, ($s1)
-/* A2D224 80242FE4 3C01442F */  lui       $at, 0x442f
-/* A2D228 80242FE8 44811000 */  mtc1      $at, $f2
-/* A2D22C 80242FEC 0040182D */  daddu     $v1, $v0, $zero
-/* A2D230 80242FF0 A6030506 */  sh        $v1, 0x506($s0)
-/* A2D234 80242FF4 46020032 */  c.eq.s    $f0, $f2
-/* A2D238 80242FF8 00000000 */  nop
-/* A2D23C 80242FFC 45010002 */  bc1t      .L80243008
-/* A2D240 80243000 E60004DC */   swc1     $f0, 0x4dc($s0)
-/* A2D244 80243004 0000102D */  daddu     $v0, $zero, $zero
-.L80243008:
-/* A2D248 80243008 8FBF0020 */  lw        $ra, 0x20($sp)
-/* A2D24C 8024300C 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2D250 80243010 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2D254 80243014 03E00008 */  jr        $ra
-/* A2D258 80243018 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s
deleted file mode 100644
index 2255f96a11..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s
+++ /dev/null
@@ -1,62 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024301C_A2D25C
-/* A2D25C 8024301C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* A2D260 80243020 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2D264 80243024 00A0802D */  daddu     $s0, $a1, $zero
-/* A2D268 80243028 AFBF0020 */  sw        $ra, 0x20($sp)
-/* A2D26C 8024302C AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2D270 80243030 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* A2D274 80243034 0C0B36B0 */  jal       resolve_npc
-/* A2D278 80243038 24050009 */   addiu    $a1, $zero, 9
-/* A2D27C 8024303C 12000007 */  beqz      $s0, .L8024305C
-/* A2D280 80243040 0040882D */   daddu    $s1, $v0, $zero
-/* A2D284 80243044 C6200038 */  lwc1      $f0, 0x38($s1)
-/* A2D288 80243048 C6220040 */  lwc1      $f2, 0x40($s1)
-/* A2D28C 8024304C 3C018025 */  lui       $at, %hi(D_8024F2F4)
-/* A2D290 80243050 E420F2F4 */  swc1      $f0, %lo(D_8024F2F4)($at)
-/* A2D294 80243054 3C018025 */  lui       $at, %hi(D_8024F2F8)
-/* A2D298 80243058 E422F2F8 */  swc1      $f2, %lo(D_8024F2F8)($at)
-.L8024305C:
-/* A2D29C 8024305C 24040003 */  addiu     $a0, $zero, 3
-/* A2D2A0 80243060 3C108025 */  lui       $s0, %hi(D_8024A9CC_A34C0C)
-/* A2D2A4 80243064 2610A9CC */  addiu     $s0, $s0, %lo(D_8024A9CC_A34C0C)
-/* A2D2A8 80243068 C6000000 */  lwc1      $f0, ($s0)
-/* A2D2AC 8024306C 46800020 */  cvt.s.w   $f0, $f0
-/* A2D2B0 80243070 3C058025 */  lui       $a1, %hi(D_8024F2F4)
-/* A2D2B4 80243074 8CA5F2F4 */  lw        $a1, %lo(D_8024F2F4)($a1)
-/* A2D2B8 80243078 3C06C2BE */  lui       $a2, 0xc2be
-/* A2D2BC 8024307C 44070000 */  mfc1      $a3, $f0
-/* A2D2C0 80243080 3C014220 */  lui       $at, 0x4220
-/* A2D2C4 80243084 4481A000 */  mtc1      $at, $f20
-/* A2D2C8 80243088 26220038 */  addiu     $v0, $s1, 0x38
-/* A2D2CC 8024308C AFA20014 */  sw        $v0, 0x14($sp)
-/* A2D2D0 80243090 0C090439 */  jal       func_802410E4_A2B324
-/* A2D2D4 80243094 E7B40010 */   swc1     $f20, 0x10($sp)
-/* A2D2D8 80243098 C6000000 */  lwc1      $f0, ($s0)
-/* A2D2DC 8024309C 46800020 */  cvt.s.w   $f0, $f0
-/* A2D2E0 802430A0 24040003 */  addiu     $a0, $zero, 3
-/* A2D2E4 802430A4 3C058025 */  lui       $a1, %hi(D_8024F2F8)
-/* A2D2E8 802430A8 8CA5F2F8 */  lw        $a1, %lo(D_8024F2F8)($a1)
-/* A2D2EC 802430AC 3C0641A0 */  lui       $a2, 0x41a0
-/* A2D2F0 802430B0 44070000 */  mfc1      $a3, $f0
-/* A2D2F4 802430B4 26220040 */  addiu     $v0, $s1, 0x40
-/* A2D2F8 802430B8 E7B40010 */  swc1      $f20, 0x10($sp)
-/* A2D2FC 802430BC 0C090439 */  jal       func_802410E4_A2B324
-/* A2D300 802430C0 AFA20014 */   sw       $v0, 0x14($sp)
-/* A2D304 802430C4 8E030000 */  lw        $v1, ($s0)
-/* A2D308 802430C8 C6200038 */  lwc1      $f0, 0x38($s1)
-/* A2D30C 802430CC C6220040 */  lwc1      $f2, 0x40($s1)
-/* A2D310 802430D0 24630001 */  addiu     $v1, $v1, 1
-/* A2D314 802430D4 28620029 */  slti      $v0, $v1, 0x29
-/* A2D318 802430D8 E620006C */  swc1      $f0, 0x6c($s1)
-/* A2D31C 802430DC E6220074 */  swc1      $f2, 0x74($s1)
-/* A2D320 802430E0 AE030000 */  sw        $v1, ($s0)
-/* A2D324 802430E4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* A2D328 802430E8 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2D32C 802430EC 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2D330 802430F0 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* A2D334 802430F4 38420001 */  xori      $v0, $v0, 1
-/* A2D338 802430F8 03E00008 */  jr        $ra
-/* A2D33C 802430FC 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s
deleted file mode 100644
index 46c665f9ce..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243100_A2D340
-/* A2D340 80243100 3C078025 */  lui       $a3, %hi(D_8024AA20_A34C60)
-/* A2D344 80243104 8CE7AA20 */  lw        $a3, %lo(D_8024AA20_A34C60)($a3)
-/* A2D348 80243108 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* A2D34C 8024310C AFBF0020 */  sw        $ra, 0x20($sp)
-/* A2D350 80243110 94E20044 */  lhu       $v0, 0x44($a3)
-/* A2D354 80243114 00022400 */  sll       $a0, $v0, 0x10
-/* A2D358 80243118 94E20046 */  lhu       $v0, 0x46($a3)
-/* A2D35C 8024311C 8CE30000 */  lw        $v1, ($a3)
-/* A2D360 80243120 1060000D */  beqz      $v1, .L80243158
-/* A2D364 80243124 00022C00 */   sll      $a1, $v0, 0x10
-/* A2D368 80243128 240200FF */  addiu     $v0, $zero, 0xff
-/* A2D36C 8024312C AFA20010 */  sw        $v0, 0x10($sp)
-/* A2D370 80243130 24020080 */  addiu     $v0, $zero, 0x80
-/* A2D374 80243134 AFA20014 */  sw        $v0, 0x14($sp)
-/* A2D378 80243138 AFA20018 */  sw        $v0, 0x18($sp)
-/* A2D37C 8024313C 24020010 */  addiu     $v0, $zero, 0x10
-/* A2D380 80243140 00442007 */  srav      $a0, $a0, $v0
-/* A2D384 80243144 AFA2001C */  sw        $v0, 0x1c($sp)
-/* A2D388 80243148 8CE6001C */  lw        $a2, 0x1c($a3)
-/* A2D38C 8024314C 8CE70020 */  lw        $a3, 0x20($a3)
-/* A2D390 80243150 0C090C59 */  jal       func_80243164_A2D3A4
-/* A2D394 80243154 00452807 */   srav     $a1, $a1, $v0
-.L80243158:
-/* A2D398 80243158 8FBF0020 */  lw        $ra, 0x20($sp)
-/* A2D39C 8024315C 03E00008 */  jr        $ra
-/* A2D3A0 80243160 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s
deleted file mode 100644
index f0006036ce..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024370C_A2D94C
-/* A2D94C 8024370C 3C038025 */  lui       $v1, %hi(D_8024AA20_A34C60)
-/* A2D950 80243710 8C63AA20 */  lw        $v1, %lo(D_8024AA20_A34C60)($v1)
-/* A2D954 80243714 27BDFFD8 */  addiu     $sp, $sp, -0x28
-/* A2D958 80243718 AFBF0020 */  sw        $ra, 0x20($sp)
-/* A2D95C 8024371C 84640048 */  lh        $a0, 0x48($v1)
-/* A2D960 80243720 8465004A */  lh        $a1, 0x4a($v1)
-/* A2D964 80243724 8466005C */  lh        $a2, 0x5c($v1)
-/* A2D968 80243728 24020080 */  addiu     $v0, $zero, 0x80
-/* A2D96C 8024372C AFA20014 */  sw        $v0, 0x14($sp)
-/* A2D970 80243730 AFA20018 */  sw        $v0, 0x18($sp)
-/* A2D974 80243734 24020020 */  addiu     $v0, $zero, 0x20
-/* A2D978 80243738 AFA2001C */  sw        $v0, 0x1c($sp)
-/* A2D97C 8024373C AFA60010 */  sw        $a2, 0x10($sp)
-/* A2D980 80243740 8C660018 */  lw        $a2, 0x18($v1)
-/* A2D984 80243744 0C090C59 */  jal       func_80243164_A2D3A4
-/* A2D988 80243748 0000382D */   daddu    $a3, $zero, $zero
-/* A2D98C 8024374C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* A2D990 80243750 03E00008 */  jr        $ra
-/* A2D994 80243754 27BD0028 */   addiu    $sp, $sp, 0x28
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s
deleted file mode 100644
index d4af548056..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s
+++ /dev/null
@@ -1,140 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243CC0_A2DF00
-/* A2DF00 80243CC0 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* A2DF04 80243CC4 3C038007 */  lui       $v1, %hi(gCurrentCameraID)
-/* A2DF08 80243CC8 8C637410 */  lw        $v1, %lo(gCurrentCameraID)($v1)
-/* A2DF0C 80243CCC 3C04800B */  lui       $a0, %hi(gCameras)
-/* A2DF10 80243CD0 24841D80 */  addiu     $a0, $a0, %lo(gCameras)
-/* A2DF14 80243CD4 AFBF0028 */  sw        $ra, 0x28($sp)
-/* A2DF18 80243CD8 AFB30024 */  sw        $s3, 0x24($sp)
-/* A2DF1C 80243CDC AFB20020 */  sw        $s2, 0x20($sp)
-/* A2DF20 80243CE0 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2DF24 80243CE4 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2DF28 80243CE8 00031080 */  sll       $v0, $v1, 2
-/* A2DF2C 80243CEC 00431021 */  addu      $v0, $v0, $v1
-/* A2DF30 80243CF0 00021080 */  sll       $v0, $v0, 2
-/* A2DF34 80243CF4 00431023 */  subu      $v0, $v0, $v1
-/* A2DF38 80243CF8 000218C0 */  sll       $v1, $v0, 3
-/* A2DF3C 80243CFC 00431021 */  addu      $v0, $v0, $v1
-/* A2DF40 80243D00 000210C0 */  sll       $v0, $v0, 3
-/* A2DF44 80243D04 00441021 */  addu      $v0, $v0, $a0
-/* A2DF48 80243D08 8451000E */  lh        $s1, 0xe($v0)
-/* A2DF4C 80243D0C 0C090DC3 */  jal       func_8024370C_A2D94C
-/* A2DF50 80243D10 84520010 */   lh       $s2, 0x10($v0)
-/* A2DF54 80243D14 3C05FF10 */  lui       $a1, 0xff10
-/* A2DF58 80243D18 3C10800A */  lui       $s0, %hi(gMasterGfxPos)
-/* A2DF5C 80243D1C 2610A66C */  addiu     $s0, $s0, %lo(gMasterGfxPos)
-/* A2DF60 80243D20 34A5013F */  ori       $a1, $a1, 0x13f
-/* A2DF64 80243D24 8E060000 */  lw        $a2, ($s0)
-/* A2DF68 80243D28 3C02DE00 */  lui       $v0, 0xde00
-/* A2DF6C 80243D2C 00C0202D */  daddu     $a0, $a2, $zero
-/* A2DF70 80243D30 24C60008 */  addiu     $a2, $a2, 8
-/* A2DF74 80243D34 AE060000 */  sw        $a2, ($s0)
-/* A2DF78 80243D38 3C03800A */  lui       $v1, %hi(nuGfxCfb_ptr)
-/* A2DF7C 80243D3C 8C63A64C */  lw        $v1, %lo(nuGfxCfb_ptr)($v1)
-/* A2DF80 80243D40 3C138025 */  lui       $s3, %hi(D_8024AA20_A34C60)
-/* A2DF84 80243D44 2673AA20 */  addiu     $s3, $s3, %lo(D_8024AA20_A34C60)
-/* A2DF88 80243D48 AC820000 */  sw        $v0, ($a0)
-/* A2DF8C 80243D4C 8E670000 */  lw        $a3, ($s3)
-/* A2DF90 80243D50 3C028025 */  lui       $v0, %hi(D_8024AA28_A34C68)
-/* A2DF94 80243D54 2442AA28 */  addiu     $v0, $v0, %lo(D_8024AA28_A34C68)
-/* A2DF98 80243D58 AC820004 */  sw        $v0, 4($a0)
-/* A2DF9C 80243D5C ACC50000 */  sw        $a1, ($a2)
-/* A2DFA0 80243D60 ACC30004 */  sw        $v1, 4($a2)
-/* A2DFA4 80243D64 84E2005A */  lh        $v0, 0x5a($a3)
-/* A2DFA8 80243D68 24C30008 */  addiu     $v1, $a2, 8
-/* A2DFAC 80243D6C 284200FF */  slti      $v0, $v0, 0xff
-/* A2DFB0 80243D70 1040000F */  beqz      $v0, .L80243DB0
-/* A2DFB4 80243D74 AE030000 */   sw       $v1, ($s0)
-/* A2DFB8 80243D78 3C04E200 */  lui       $a0, 0xe200
-/* A2DFBC 80243D7C 3484001C */  ori       $a0, $a0, 0x1c
-/* A2DFC0 80243D80 3C030050 */  lui       $v1, 0x50
-/* A2DFC4 80243D84 34634340 */  ori       $v1, $v1, 0x4340
-/* A2DFC8 80243D88 24C20010 */  addiu     $v0, $a2, 0x10
-/* A2DFCC 80243D8C AE020000 */  sw        $v0, ($s0)
-/* A2DFD0 80243D90 24C20018 */  addiu     $v0, $a2, 0x18
-/* A2DFD4 80243D94 ACC40008 */  sw        $a0, 8($a2)
-/* A2DFD8 80243D98 ACC3000C */  sw        $v1, 0xc($a2)
-/* A2DFDC 80243D9C AE020000 */  sw        $v0, ($s0)
-/* A2DFE0 80243DA0 3C02FA00 */  lui       $v0, 0xfa00
-/* A2DFE4 80243DA4 ACC20010 */  sw        $v0, 0x10($a2)
-/* A2DFE8 80243DA8 90E2005B */  lbu       $v0, 0x5b($a3)
-/* A2DFEC 80243DAC ACC20014 */  sw        $v0, 0x14($a2)
-.L80243DB0:
-/* A2DFF0 80243DB0 24040001 */  addiu     $a0, $zero, 1
-/* A2DFF4 80243DB4 27A50010 */  addiu     $a1, $sp, 0x10
-/* A2DFF8 80243DB8 0C04DF70 */  jal       get_screen_overlay_params
-/* A2DFFC 80243DBC 27A60014 */   addiu    $a2, $sp, 0x14
-/* A2E000 80243DC0 C7A20014 */  lwc1      $f2, 0x14($sp)
-/* A2E004 80243DC4 44800000 */  mtc1      $zero, $f0
-/* A2E008 80243DC8 00000000 */  nop
-/* A2E00C 80243DCC 46001032 */  c.eq.s    $f2, $f0
-/* A2E010 80243DD0 00000000 */  nop
-/* A2E014 80243DD4 45010016 */  bc1t      .L80243E30
-/* A2E018 80243DD8 3C05FC35 */   lui      $a1, 0xfc35
-/* A2E01C 80243DDC 34A57E6A */  ori       $a1, $a1, 0x7e6a
-/* A2E020 80243DE0 3C0411FC */  lui       $a0, 0x11fc
-/* A2E024 80243DE4 3484FC7E */  ori       $a0, $a0, 0xfc7e
-/* A2E028 80243DE8 3C06D0D0 */  lui       $a2, 0xd0d0
-/* A2E02C 80243DEC 8E030000 */  lw        $v1, ($s0)
-/* A2E030 80243DF0 34C6D000 */  ori       $a2, $a2, 0xd000
-/* A2E034 80243DF4 0060102D */  daddu     $v0, $v1, $zero
-/* A2E038 80243DF8 24630008 */  addiu     $v1, $v1, 8
-/* A2E03C 80243DFC AE030000 */  sw        $v1, ($s0)
-/* A2E040 80243E00 AC450000 */  sw        $a1, ($v0)
-/* A2E044 80243E04 AC440004 */  sw        $a0, 4($v0)
-/* A2E048 80243E08 24620008 */  addiu     $v0, $v1, 8
-/* A2E04C 80243E0C AE020000 */  sw        $v0, ($s0)
-/* A2E050 80243E10 3C02FA00 */  lui       $v0, 0xfa00
-/* A2E054 80243E14 AC620000 */  sw        $v0, ($v1)
-/* A2E058 80243E18 4600110D */  trunc.w.s $f4, $f2
-/* A2E05C 80243E1C 44022000 */  mfc1      $v0, $f4
-/* A2E060 80243E20 00000000 */  nop
-/* A2E064 80243E24 304200FF */  andi      $v0, $v0, 0xff
-/* A2E068 80243E28 00461025 */  or        $v0, $v0, $a2
-/* A2E06C 80243E2C AC620004 */  sw        $v0, 4($v1)
-.L80243E30:
-/* A2E070 80243E30 8E630000 */  lw        $v1, ($s3)
-/* A2E074 80243E34 84620058 */  lh        $v0, 0x58($v1)
-/* A2E078 80243E38 1440000F */  bnez      $v0, .L80243E78
-/* A2E07C 80243E3C 00000000 */   nop
-/* A2E080 80243E40 8C66000C */  lw        $a2, 0xc($v1)
-/* A2E084 80243E44 8C670010 */  lw        $a3, 0x10($v1)
-/* A2E088 80243E48 84640040 */  lh        $a0, 0x40($v1)
-/* A2E08C 80243E4C 84650042 */  lh        $a1, 0x42($v1)
-/* A2E090 80243E50 02242021 */  addu      $a0, $s1, $a0
-/* A2E094 80243E54 0C090DD6 */  jal       func_80243758_A2D998
-/* A2E098 80243E58 02452821 */   addu     $a1, $s2, $a1
-/* A2E09C 80243E5C 8E620000 */  lw        $v0, ($s3)
-/* A2E0A0 80243E60 8C460004 */  lw        $a2, 4($v0)
-/* A2E0A4 80243E64 8C470008 */  lw        $a3, 8($v0)
-/* A2E0A8 80243E68 8444003C */  lh        $a0, 0x3c($v0)
-/* A2E0AC 80243E6C 8445003E */  lh        $a1, 0x3e($v0)
-/* A2E0B0 80243E70 08090FAB */  j         .L80243EAC
-/* A2E0B4 80243E74 02242021 */   addu     $a0, $s1, $a0
-.L80243E78:
-/* A2E0B8 80243E78 8C660004 */  lw        $a2, 4($v1)
-/* A2E0BC 80243E7C 8C670008 */  lw        $a3, 8($v1)
-/* A2E0C0 80243E80 8464003C */  lh        $a0, 0x3c($v1)
-/* A2E0C4 80243E84 8465003E */  lh        $a1, 0x3e($v1)
-/* A2E0C8 80243E88 02242021 */  addu      $a0, $s1, $a0
-/* A2E0CC 80243E8C 0C090DD6 */  jal       func_80243758_A2D998
-/* A2E0D0 80243E90 02452821 */   addu     $a1, $s2, $a1
-/* A2E0D4 80243E94 8E620000 */  lw        $v0, ($s3)
-/* A2E0D8 80243E98 8C46000C */  lw        $a2, 0xc($v0)
-/* A2E0DC 80243E9C 8C470010 */  lw        $a3, 0x10($v0)
-/* A2E0E0 80243EA0 84440040 */  lh        $a0, 0x40($v0)
-/* A2E0E4 80243EA4 84450042 */  lh        $a1, 0x42($v0)
-/* A2E0E8 80243EA8 02242021 */  addu      $a0, $s1, $a0
-.L80243EAC:
-/* A2E0EC 80243EAC 0C090DD6 */  jal       func_80243758_A2D998
-/* A2E0F0 80243EB0 02452821 */   addu     $a1, $s2, $a1
-/* A2E0F4 80243EB4 8FBF0028 */  lw        $ra, 0x28($sp)
-/* A2E0F8 80243EB8 8FB30024 */  lw        $s3, 0x24($sp)
-/* A2E0FC 80243EBC 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2E100 80243EC0 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2E104 80243EC4 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2E108 80243EC8 03E00008 */  jr        $ra
-/* A2E10C 80243ECC 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s
deleted file mode 100644
index c14720df8c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s
+++ /dev/null
@@ -1,70 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243ED0_A2E110
-/* A2E110 80243ED0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2E114 80243ED4 24A5FFFF */  addiu     $a1, $a1, -1
-/* A2E118 80243ED8 04A1000C */  bgez      $a1, .L80243F0C
-/* A2E11C 80243EDC AFBF0010 */   sw       $ra, 0x10($sp)
-/* A2E120 80243EE0 3404D6B5 */  ori       $a0, $zero, 0xd6b5
-/* A2E124 80243EE4 3C028025 */  lui       $v0, %hi(D_8024AA20_A34C60)
-/* A2E128 80243EE8 8C42AA20 */  lw        $v0, %lo(D_8024AA20_A34C60)($v0)
-/* A2E12C 80243EEC 240300FF */  addiu     $v1, $zero, 0xff
-/* A2E130 80243EF0 8C420008 */  lw        $v0, 8($v0)
-.L80243EF4:
-/* A2E134 80243EF4 A4440000 */  sh        $a0, ($v0)
-/* A2E138 80243EF8 2463FFFF */  addiu     $v1, $v1, -1
-/* A2E13C 80243EFC 0461FFFD */  bgez      $v1, .L80243EF4
-/* A2E140 80243F00 24420002 */   addiu    $v0, $v0, 2
-/* A2E144 80243F04 08090FEE */  j         .L80243FB8
-/* A2E148 80243F08 00000000 */   nop
-.L80243F0C:
-/* A2E14C 80243F0C 14800010 */  bnez      $a0, .L80243F50
-/* A2E150 80243F10 00052080 */   sll      $a0, $a1, 2
-/* A2E154 80243F14 3C030022 */  lui       $v1, 0x22
-/* A2E158 80243F18 246391B0 */  addiu     $v1, $v1, -0x6e50
-/* A2E15C 80243F1C 00852021 */  addu      $a0, $a0, $a1
-/* A2E160 80243F20 00042080 */  sll       $a0, $a0, 2
-/* A2E164 80243F24 00852021 */  addu      $a0, $a0, $a1
-/* A2E168 80243F28 000420C0 */  sll       $a0, $a0, 3
-/* A2E16C 80243F2C 00852021 */  addu      $a0, $a0, $a1
-/* A2E170 80243F30 00042100 */  sll       $a0, $a0, 4
-/* A2E174 80243F34 00852021 */  addu      $a0, $a0, $a1
-/* A2E178 80243F38 00042100 */  sll       $a0, $a0, 4
-/* A2E17C 80243F3C 3C028025 */  lui       $v0, %hi(D_8024AA20_A34C60)
-/* A2E180 80243F40 8C42AA20 */  lw        $v0, %lo(D_8024AA20_A34C60)($v0)
-/* A2E184 80243F44 8C460004 */  lw        $a2, 4($v0)
-/* A2E188 80243F48 08090FE2 */  j         .L80243F88
-/* A2E18C 80243F4C 00832021 */   addu     $a0, $a0, $v1
-.L80243F50:
-/* A2E190 80243F50 3C030022 */  lui       $v1, 0x22
-/* A2E194 80243F54 246391B0 */  addiu     $v1, $v1, -0x6e50
-/* A2E198 80243F58 00852021 */  addu      $a0, $a0, $a1
-/* A2E19C 80243F5C 00042080 */  sll       $a0, $a0, 2
-/* A2E1A0 80243F60 00852021 */  addu      $a0, $a0, $a1
-/* A2E1A4 80243F64 000420C0 */  sll       $a0, $a0, 3
-/* A2E1A8 80243F68 00852021 */  addu      $a0, $a0, $a1
-/* A2E1AC 80243F6C 00042100 */  sll       $a0, $a0, 4
-/* A2E1B0 80243F70 00852021 */  addu      $a0, $a0, $a1
-/* A2E1B4 80243F74 00042100 */  sll       $a0, $a0, 4
-/* A2E1B8 80243F78 3C028025 */  lui       $v0, %hi(D_8024AA20_A34C60)
-/* A2E1BC 80243F7C 8C42AA20 */  lw        $v0, %lo(D_8024AA20_A34C60)($v0)
-/* A2E1C0 80243F80 00832021 */  addu      $a0, $a0, $v1
-/* A2E1C4 80243F84 8C46000C */  lw        $a2, 0xc($v0)
-.L80243F88:
-/* A2E1C8 80243F88 24A20001 */  addiu     $v0, $a1, 1
-/* A2E1CC 80243F8C 00022880 */  sll       $a1, $v0, 2
-/* A2E1D0 80243F90 00A22821 */  addu      $a1, $a1, $v0
-/* A2E1D4 80243F94 00052880 */  sll       $a1, $a1, 2
-/* A2E1D8 80243F98 00A22821 */  addu      $a1, $a1, $v0
-/* A2E1DC 80243F9C 000528C0 */  sll       $a1, $a1, 3
-/* A2E1E0 80243FA0 00A22821 */  addu      $a1, $a1, $v0
-/* A2E1E4 80243FA4 00052900 */  sll       $a1, $a1, 4
-/* A2E1E8 80243FA8 00A22821 */  addu      $a1, $a1, $v0
-/* A2E1EC 80243FAC 00052900 */  sll       $a1, $a1, 4
-/* A2E1F0 80243FB0 0C00A5CF */  jal       dma_copy
-/* A2E1F4 80243FB4 00A32821 */   addu     $a1, $a1, $v1
-.L80243FB8:
-/* A2E1F8 80243FB8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A2E1FC 80243FBC 03E00008 */  jr        $ra
-/* A2E200 80243FC0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s
deleted file mode 100644
index d3f9e8121e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s
+++ /dev/null
@@ -1,43 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244454_A2E694
-/* A2E694 80244454 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2E698 80244458 3C058025 */  lui       $a1, %hi(D_8024ACB8_A34EF8)
-/* A2E69C 8024445C 24A5ACB8 */  addiu     $a1, $a1, %lo(D_8024ACB8_A34EF8)
-/* A2E6A0 80244460 AFBF0014 */  sw        $ra, 0x14($sp)
-/* A2E6A4 80244464 AFB00010 */  sw        $s0, 0x10($sp)
-/* A2E6A8 80244468 8CA40000 */  lw        $a0, ($a1)
-/* A2E6AC 8024446C 1480000B */  bnez      $a0, .L8024449C
-/* A2E6B0 80244470 3C028888 */   lui      $v0, 0x8888
-/* A2E6B4 80244474 3C108025 */  lui       $s0, %hi(D_8024AA20_A34C60)
-/* A2E6B8 80244478 2610AA20 */  addiu     $s0, $s0, %lo(D_8024AA20_A34C60)
-/* A2E6BC 8024447C 8E020000 */  lw        $v0, ($s0)
-/* A2E6C0 80244480 8C440000 */  lw        $a0, ($v0)
-/* A2E6C4 80244484 0C048D70 */  jal       free_generic_entity
-/* A2E6C8 80244488 A440005C */   sh       $zero, 0x5c($v0)
-/* A2E6CC 8024448C 8E030000 */  lw        $v1, ($s0)
-/* A2E6D0 80244490 24020001 */  addiu     $v0, $zero, 1
-/* A2E6D4 80244494 08091136 */  j         .L802444D8
-/* A2E6D8 80244498 AC600000 */   sw       $zero, ($v1)
-.L8024449C:
-/* A2E6DC 8024449C 34428889 */  ori       $v0, $v0, 0x8889
-/* A2E6E0 802444A0 2484FFFF */  addiu     $a0, $a0, -1
-/* A2E6E4 802444A4 00041A00 */  sll       $v1, $a0, 8
-/* A2E6E8 802444A8 00641823 */  subu      $v1, $v1, $a0
-/* A2E6EC 802444AC 00620018 */  mult      $v1, $v0
-/* A2E6F0 802444B0 0000102D */  daddu     $v0, $zero, $zero
-/* A2E6F4 802444B4 ACA40000 */  sw        $a0, ($a1)
-/* A2E6F8 802444B8 3C058025 */  lui       $a1, %hi(D_8024AA20_A34C60)
-/* A2E6FC 802444BC 8CA5AA20 */  lw        $a1, %lo(D_8024AA20_A34C60)($a1)
-/* A2E700 802444C0 00003010 */  mfhi      $a2
-/* A2E704 802444C4 00C32021 */  addu      $a0, $a2, $v1
-/* A2E708 802444C8 00042103 */  sra       $a0, $a0, 4
-/* A2E70C 802444CC 00031FC3 */  sra       $v1, $v1, 0x1f
-/* A2E710 802444D0 00832023 */  subu      $a0, $a0, $v1
-/* A2E714 802444D4 A4A4005C */  sh        $a0, 0x5c($a1)
-.L802444D8:
-/* A2E718 802444D8 8FBF0014 */  lw        $ra, 0x14($sp)
-/* A2E71C 802444DC 8FB00010 */  lw        $s0, 0x10($sp)
-/* A2E720 802444E0 03E00008 */  jr        $ra
-/* A2E724 802444E4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s
deleted file mode 100644
index 9dfeb45704..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802444E8_A2E728
-/* A2E728 802444E8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2E72C 802444EC AFBF0010 */  sw        $ra, 0x10($sp)
-/* A2E730 802444F0 0C0B36B0 */  jal       resolve_npc
-/* A2E734 802444F4 2405000A */   addiu    $a1, $zero, 0xa
-/* A2E738 802444F8 3C048007 */  lui       $a0, %hi(gCurrentCameraID)
-/* A2E73C 802444FC 8C847410 */  lw        $a0, %lo(gCurrentCameraID)($a0)
-/* A2E740 80244500 3C014334 */  lui       $at, 0x4334
-/* A2E744 80244504 44810000 */  mtc1      $at, $f0
-/* A2E748 80244508 00041880 */  sll       $v1, $a0, 2
-/* A2E74C 8024450C 00641821 */  addu      $v1, $v1, $a0
-/* A2E750 80244510 00031880 */  sll       $v1, $v1, 2
-/* A2E754 80244514 00641823 */  subu      $v1, $v1, $a0
-/* A2E758 80244518 000320C0 */  sll       $a0, $v1, 3
-/* A2E75C 8024451C 00641821 */  addu      $v1, $v1, $a0
-/* A2E760 80244520 000318C0 */  sll       $v1, $v1, 3
-/* A2E764 80244524 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* A2E768 80244528 00230821 */  addu      $at, $at, $v1
-/* A2E76C 8024452C C4221DEC */  lwc1      $f2, %lo(gCameras+0x6C)($at)
-/* A2E770 80244530 46020001 */  sub.s     $f0, $f0, $f2
-/* A2E774 80244534 0040182D */  daddu     $v1, $v0, $zero
-/* A2E778 80244538 E4600034 */  swc1      $f0, 0x34($v1)
-/* A2E77C 8024453C E460000C */  swc1      $f0, 0xc($v1)
-/* A2E780 80244540 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A2E784 80244544 0000102D */  daddu     $v0, $zero, $zero
-/* A2E788 80244548 03E00008 */  jr        $ra
-/* A2E78C 8024454C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s
deleted file mode 100644
index 213fbe4020..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s
+++ /dev/null
@@ -1,68 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244774_A2E9B4
-/* A2E9B4 80244774 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* A2E9B8 80244778 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2E9BC 8024477C 0080802D */  daddu     $s0, $a0, $zero
-/* A2E9C0 80244780 AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2E9C4 80244784 00A0882D */  daddu     $s1, $a1, $zero
-/* A2E9C8 80244788 AFBF0028 */  sw        $ra, 0x28($sp)
-/* A2E9CC 8024478C AFB30024 */  sw        $s3, 0x24($sp)
-/* A2E9D0 80244790 AFB20020 */  sw        $s2, 0x20($sp)
-/* A2E9D4 80244794 F7B40030 */  sdc1      $f20, 0x30($sp)
-/* A2E9D8 80244798 0C0B36B0 */  jal       resolve_npc
-/* A2E9DC 8024479C 24050007 */   addiu    $a1, $zero, 7
-/* A2E9E0 802447A0 0200202D */  daddu     $a0, $s0, $zero
-/* A2E9E4 802447A4 24050008 */  addiu     $a1, $zero, 8
-/* A2E9E8 802447A8 0C0B36B0 */  jal       resolve_npc
-/* A2E9EC 802447AC 0040902D */   daddu    $s2, $v0, $zero
-/* A2E9F0 802447B0 12200004 */  beqz      $s1, .L802447C4
-/* A2E9F4 802447B4 0040982D */   daddu    $s3, $v0, $zero
-/* A2E9F8 802447B8 C640003C */  lwc1      $f0, 0x3c($s2)
-/* A2E9FC 802447BC 3C018025 */  lui       $at, %hi(D_8024F374)
-/* A2EA00 802447C0 E420F374 */  swc1      $f0, %lo(D_8024F374)($at)
-.L802447C4:
-/* A2EA04 802447C4 3C018025 */  lui       $at, %hi(D_8024F374)
-/* A2EA08 802447C8 C420F374 */  lwc1      $f0, %lo(D_8024F374)($at)
-/* A2EA0C 802447CC 24040003 */  addiu     $a0, $zero, 3
-/* A2EA10 802447D0 44050000 */  mfc1      $a1, $f0
-/* A2EA14 802447D4 3C0143FA */  lui       $at, 0x43fa
-/* A2EA18 802447D8 44810000 */  mtc1      $at, $f0
-/* A2EA1C 802447DC 44853000 */  mtc1      $a1, $f6
-/* A2EA20 802447E0 3C108025 */  lui       $s0, %hi(D_8024AEC4_A35104)
-/* A2EA24 802447E4 2610AEC4 */  addiu     $s0, $s0, %lo(D_8024AEC4_A35104)
-/* A2EA28 802447E8 46003180 */  add.s     $f6, $f6, $f0
-/* A2EA2C 802447EC 3C014220 */  lui       $at, 0x4220
-/* A2EA30 802447F0 4481A000 */  mtc1      $at, $f20
-/* A2EA34 802447F4 8E070000 */  lw        $a3, ($s0)
-/* A2EA38 802447F8 44063000 */  mfc1      $a2, $f6
-/* A2EA3C 802447FC 2642003C */  addiu     $v0, $s2, 0x3c
-/* A2EA40 80244800 AFA20014 */  sw        $v0, 0x14($sp)
-/* A2EA44 80244804 0C090439 */  jal       func_802410E4_A2B324
-/* A2EA48 80244808 E7B40010 */   swc1     $f20, 0x10($sp)
-/* A2EA4C 8024480C C640003C */  lwc1      $f0, 0x3c($s2)
-/* A2EA50 80244810 3C013F80 */  lui       $at, 0x3f80
-/* A2EA54 80244814 44811000 */  mtc1      $at, $f2
-/* A2EA58 80244818 E660003C */  swc1      $f0, 0x3c($s3)
-/* A2EA5C 8024481C C6000000 */  lwc1      $f0, ($s0)
-/* A2EA60 80244820 C644003C */  lwc1      $f4, 0x3c($s2)
-/* A2EA64 80244824 46020000 */  add.s     $f0, $f0, $f2
-/* A2EA68 80244828 E6440070 */  swc1      $f4, 0x70($s2)
-/* A2EA6C 8024482C C662003C */  lwc1      $f2, 0x3c($s3)
-/* A2EA70 80244830 24020001 */  addiu     $v0, $zero, 1
-/* A2EA74 80244834 E6620070 */  swc1      $f2, 0x70($s3)
-/* A2EA78 80244838 4600A03C */  c.lt.s    $f20, $f0
-/* A2EA7C 8024483C 00000000 */  nop
-/* A2EA80 80244840 45010002 */  bc1t      .L8024484C
-/* A2EA84 80244844 E6000000 */   swc1     $f0, ($s0)
-/* A2EA88 80244848 0000102D */  daddu     $v0, $zero, $zero
-.L8024484C:
-/* A2EA8C 8024484C 8FBF0028 */  lw        $ra, 0x28($sp)
-/* A2EA90 80244850 8FB30024 */  lw        $s3, 0x24($sp)
-/* A2EA94 80244854 8FB20020 */  lw        $s2, 0x20($sp)
-/* A2EA98 80244858 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2EA9C 8024485C 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2EAA0 80244860 D7B40030 */  ldc1      $f20, 0x30($sp)
-/* A2EAA4 80244864 03E00008 */  jr        $ra
-/* A2EAA8 80244868 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s
deleted file mode 100644
index b97e78bf70..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s
+++ /dev/null
@@ -1,56 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024486C_A2EAAC
-/* A2EAAC 8024486C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* A2EAB0 80244870 AFB00018 */  sw        $s0, 0x18($sp)
-/* A2EAB4 80244874 00A0802D */  daddu     $s0, $a1, $zero
-/* A2EAB8 80244878 AFBF0020 */  sw        $ra, 0x20($sp)
-/* A2EABC 8024487C AFB1001C */  sw        $s1, 0x1c($sp)
-/* A2EAC0 80244880 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* A2EAC4 80244884 0C0B36B0 */  jal       resolve_npc
-/* A2EAC8 80244888 24050009 */   addiu    $a1, $zero, 9
-/* A2EACC 8024488C 12000004 */  beqz      $s0, .L802448A0
-/* A2EAD0 80244890 0040882D */   daddu    $s1, $v0, $zero
-/* A2EAD4 80244894 C620003C */  lwc1      $f0, 0x3c($s1)
-/* A2EAD8 80244898 3C018025 */  lui       $at, %hi(D_8024F378)
-/* A2EADC 8024489C E420F378 */  swc1      $f0, %lo(D_8024F378)($at)
-.L802448A0:
-/* A2EAE0 802448A0 3C018025 */  lui       $at, %hi(D_8024F378)
-/* A2EAE4 802448A4 C420F378 */  lwc1      $f0, %lo(D_8024F378)($at)
-/* A2EAE8 802448A8 24040003 */  addiu     $a0, $zero, 3
-/* A2EAEC 802448AC 44050000 */  mfc1      $a1, $f0
-/* A2EAF0 802448B0 3C0143FA */  lui       $at, 0x43fa
-/* A2EAF4 802448B4 44810000 */  mtc1      $at, $f0
-/* A2EAF8 802448B8 44852000 */  mtc1      $a1, $f4
-/* A2EAFC 802448BC 3C108025 */  lui       $s0, %hi(D_8024AEC8_A35108)
-/* A2EB00 802448C0 2610AEC8 */  addiu     $s0, $s0, %lo(D_8024AEC8_A35108)
-/* A2EB04 802448C4 46002100 */  add.s     $f4, $f4, $f0
-/* A2EB08 802448C8 3C014220 */  lui       $at, 0x4220
-/* A2EB0C 802448CC 4481A000 */  mtc1      $at, $f20
-/* A2EB10 802448D0 8E070000 */  lw        $a3, ($s0)
-/* A2EB14 802448D4 44062000 */  mfc1      $a2, $f4
-/* A2EB18 802448D8 2622003C */  addiu     $v0, $s1, 0x3c
-/* A2EB1C 802448DC AFA20014 */  sw        $v0, 0x14($sp)
-/* A2EB20 802448E0 0C090439 */  jal       func_802410E4_A2B324
-/* A2EB24 802448E4 E7B40010 */   swc1     $f20, 0x10($sp)
-/* A2EB28 802448E8 C6020000 */  lwc1      $f2, ($s0)
-/* A2EB2C 802448EC 3C013F80 */  lui       $at, 0x3f80
-/* A2EB30 802448F0 44810000 */  mtc1      $at, $f0
-/* A2EB34 802448F4 00000000 */  nop
-/* A2EB38 802448F8 46001080 */  add.s     $f2, $f2, $f0
-/* A2EB3C 802448FC C620003C */  lwc1      $f0, 0x3c($s1)
-/* A2EB40 80244900 24020001 */  addiu     $v0, $zero, 1
-/* A2EB44 80244904 E6200070 */  swc1      $f0, 0x70($s1)
-/* A2EB48 80244908 4602A03C */  c.lt.s    $f20, $f2
-/* A2EB4C 8024490C 00000000 */  nop
-/* A2EB50 80244910 45010002 */  bc1t      .L8024491C
-/* A2EB54 80244914 E6020000 */   swc1     $f2, ($s0)
-/* A2EB58 80244918 0000102D */  daddu     $v0, $zero, $zero
-.L8024491C:
-/* A2EB5C 8024491C 8FBF0020 */  lw        $ra, 0x20($sp)
-/* A2EB60 80244920 8FB1001C */  lw        $s1, 0x1c($sp)
-/* A2EB64 80244924 8FB00018 */  lw        $s0, 0x18($sp)
-/* A2EB68 80244928 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* A2EB6C 8024492C 03E00008 */  jr        $ra
-/* A2EB70 80244930 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s
deleted file mode 100644
index 069332e6de..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s
+++ /dev/null
@@ -1,55 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244934_A2EB74
-/* A2EB74 80244934 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A2EB78 80244938 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A2EB7C 8024493C 10A00005 */  beqz      $a1, .L80244954
-/* A2EB80 80244940 0080182D */   daddu    $v1, $a0, $zero
-/* A2EB84 80244944 3C05437F */  lui       $a1, 0x437f
-/* A2EB88 80244948 24040001 */  addiu     $a0, $zero, 1
-/* A2EB8C 8024494C 08091264 */  j         .L80244990
-/* A2EB90 80244950 AC600070 */   sw       $zero, 0x70($v1)
-.L80244954:
-/* A2EB94 80244954 8C620070 */  lw        $v0, 0x70($v1)
-/* A2EB98 80244958 24420001 */  addiu     $v0, $v0, 1
-/* A2EB9C 8024495C AC620070 */  sw        $v0, 0x70($v1)
-/* A2EBA0 80244960 2403000A */  addiu     $v1, $zero, 0xa
-/* A2EBA4 80244964 10430013 */  beq       $v0, $v1, .L802449B4
-/* A2EBA8 80244968 24040001 */   addiu    $a0, $zero, 1
-/* A2EBAC 8024496C 00621823 */  subu      $v1, $v1, $v0
-/* A2EBB0 80244970 00831004 */  sllv      $v0, $v1, $a0
-/* A2EBB4 80244974 00431021 */  addu      $v0, $v0, $v1
-/* A2EBB8 80244978 000210C0 */  sll       $v0, $v0, 3
-/* A2EBBC 8024497C 00431021 */  addu      $v0, $v0, $v1
-/* A2EBC0 80244980 44820000 */  mtc1      $v0, $f0
-/* A2EBC4 80244984 00000000 */  nop
-/* A2EBC8 80244988 46800020 */  cvt.s.w   $f0, $f0
-/* A2EBCC 8024498C 44050000 */  mfc1      $a1, $f0
-.L80244990:
-/* A2EBD0 80244990 0C04DF69 */  jal       set_screen_overlay_params_back
-/* A2EBD4 80244994 00000000 */   nop
-/* A2EBD8 80244998 24040001 */  addiu     $a0, $zero, 1
-/* A2EBDC 8024499C 240500FA */  addiu     $a1, $zero, 0xfa
-/* A2EBE0 802449A0 00A0302D */  daddu     $a2, $a1, $zero
-/* A2EBE4 802449A4 0C04DF84 */  jal       set_screen_overlay_color
-/* A2EBE8 802449A8 00A0382D */   daddu    $a3, $a1, $zero
-/* A2EBEC 802449AC 08091276 */  j         .L802449D8
-/* A2EBF0 802449B0 0000102D */   daddu    $v0, $zero, $zero
-.L802449B4:
-/* A2EBF4 802449B4 0000202D */  daddu     $a0, $zero, $zero
-/* A2EBF8 802449B8 0C04DF69 */  jal       set_screen_overlay_params_back
-/* A2EBFC 802449BC 0000282D */   daddu    $a1, $zero, $zero
-/* A2EC00 802449C0 24040001 */  addiu     $a0, $zero, 1
-/* A2EC04 802449C4 240500FA */  addiu     $a1, $zero, 0xfa
-/* A2EC08 802449C8 00A0302D */  daddu     $a2, $a1, $zero
-/* A2EC0C 802449CC 0C04DF84 */  jal       set_screen_overlay_color
-/* A2EC10 802449D0 00A0382D */   daddu    $a3, $a1, $zero
-/* A2EC14 802449D4 24020002 */  addiu     $v0, $zero, 2
-.L802449D8:
-/* A2EC18 802449D8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A2EC1C 802449DC 03E00008 */  jr        $ra
-/* A2EC20 802449E0 27BD0018 */   addiu    $sp, $sp, 0x18
-/* A2EC24 802449E4 00000000 */  nop
-/* A2EC28 802449E8 00000000 */  nop
-/* A2EC2C 802449EC 00000000 */  nop
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s
deleted file mode 100644
index 1c92c01117..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s
+++ /dev/null
@@ -1,116 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel update_heroes_start_turn_A2C264
-/* A2C264 80242024 27BDFFB8 */  addiu     $sp, $sp, -0x48
-/* A2C268 80242028 AFB30034 */  sw        $s3, 0x34($sp)
-/* A2C26C 8024202C 0080982D */  daddu     $s3, $a0, $zero
-/* A2C270 80242030 0000202D */  daddu     $a0, $zero, $zero
-/* A2C274 80242034 AFB20030 */  sw        $s2, 0x30($sp)
-/* A2C278 80242038 3C128025 */  lui       $s2, %hi(D_80249A70_A33CB0)
-/* A2C27C 8024203C 26529A70 */  addiu     $s2, $s2, %lo(D_80249A70_A33CB0)
-/* A2C280 80242040 AFBF0038 */  sw        $ra, 0x38($sp)
-/* A2C284 80242044 AFB1002C */  sw        $s1, 0x2c($sp)
-/* A2C288 80242048 AFB00028 */  sw        $s0, 0x28($sp)
-/* A2C28C 8024204C F7B40040 */  sdc1      $f20, 0x40($sp)
-/* A2C290 80242050 C6400000 */  lwc1      $f0, ($s2)
-/* A2C294 80242054 46800020 */  cvt.s.w   $f0, $f0
-/* A2C298 80242058 3C118025 */  lui       $s1, %hi(D_80249A6C_A33CAC)
-/* A2C29C 8024205C 26319A6C */  addiu     $s1, $s1, %lo(D_80249A6C_A33CAC)
-/* A2C2A0 80242060 3C0542F3 */  lui       $a1, 0x42f3
-/* A2C2A4 80242064 34A53333 */  ori       $a1, $a1, 0x3333
-/* A2C2A8 80242068 3C0142B4 */  lui       $at, 0x42b4
-/* A2C2AC 8024206C 4481A000 */  mtc1      $at, $f20
-/* A2C2B0 80242070 44070000 */  mfc1      $a3, $f0
-/* A2C2B4 80242074 3C014220 */  lui       $at, 0x4220
-/* A2C2B8 80242078 44810000 */  mtc1      $at, $f0
-/* A2C2BC 8024207C 3C028007 */  lui       $v0, %hi(gCurrentCameraID)
-/* A2C2C0 80242080 8C427410 */  lw        $v0, %lo(gCurrentCameraID)($v0)
-/* A2C2C4 80242084 3C03800B */  lui       $v1, %hi(gCameras)
-/* A2C2C8 80242088 24631D80 */  addiu     $v1, $v1, %lo(gCameras)
-/* A2C2CC 8024208C AFB10014 */  sw        $s1, 0x14($sp)
-/* A2C2D0 80242090 00028080 */  sll       $s0, $v0, 2
-/* A2C2D4 80242094 02028021 */  addu      $s0, $s0, $v0
-/* A2C2D8 80242098 00108080 */  sll       $s0, $s0, 2
-/* A2C2DC 8024209C 02028023 */  subu      $s0, $s0, $v0
-/* A2C2E0 802420A0 001010C0 */  sll       $v0, $s0, 3
-/* A2C2E4 802420A4 02028021 */  addu      $s0, $s0, $v0
-/* A2C2E8 802420A8 001080C0 */  sll       $s0, $s0, 3
-/* A2C2EC 802420AC 4406A000 */  mfc1      $a2, $f20
-/* A2C2F0 802420B0 02038021 */  addu      $s0, $s0, $v1
-/* A2C2F4 802420B4 0C090439 */  jal       func_802410E4_A2B324
-/* A2C2F8 802420B8 E7A00010 */   swc1     $f0, 0x10($sp)
-/* A2C2FC 802420BC 3C026666 */  lui       $v0, 0x6666
-/* A2C300 802420C0 34426667 */  ori       $v0, $v0, 0x6667
-/* A2C304 802420C4 8E440000 */  lw        $a0, ($s2)
-/* A2C308 802420C8 C6200000 */  lwc1      $f0, ($s1)
-/* A2C30C 802420CC 00820018 */  mult      $a0, $v0
-/* A2C310 802420D0 24020001 */  addiu     $v0, $zero, 1
-/* A2C314 802420D4 A6020506 */  sh        $v0, 0x506($s0)
-/* A2C318 802420D8 000417C3 */  sra       $v0, $a0, 0x1f
-/* A2C31C 802420DC 00004010 */  mfhi      $t0
-/* A2C320 802420E0 00081843 */  sra       $v1, $t0, 1
-/* A2C324 802420E4 00621823 */  subu      $v1, $v1, $v0
-/* A2C328 802420E8 00031080 */  sll       $v0, $v1, 2
-/* A2C32C 802420EC 00431021 */  addu      $v0, $v0, $v1
-/* A2C330 802420F0 1482002C */  bne       $a0, $v0, .L802421A4
-/* A2C334 802420F4 E60004DC */   swc1     $f0, 0x4dc($s0)
-/* A2C338 802420F8 46140032 */  c.eq.s    $f0, $f20
-/* A2C33C 802420FC 00000000 */  nop
-/* A2C340 80242100 45010028 */  bc1t      .L802421A4
-/* A2C344 80242104 0260202D */   daddu    $a0, $s3, $zero
-/* A2C348 80242108 0C0B36B0 */  jal       resolve_npc
-/* A2C34C 8024210C 24050007 */   addiu    $a1, $zero, 7
-/* A2C350 80242110 C6600084 */  lwc1      $f0, 0x84($s3)
-/* A2C354 80242114 46800020 */  cvt.s.w   $f0, $f0
-/* A2C358 80242118 C6680088 */  lwc1      $f8, 0x88($s3)
-/* A2C35C 8024211C 46804220 */  cvt.s.w   $f8, $f8
-/* A2C360 80242120 C666008C */  lwc1      $f6, 0x8c($s3)
-/* A2C364 80242124 468031A0 */  cvt.s.w   $f6, $f6
-/* A2C368 80242128 44050000 */  mfc1      $a1, $f0
-/* A2C36C 8024212C 8E630090 */  lw        $v1, 0x90($s3)
-/* A2C370 80242130 C444003C */  lwc1      $f4, 0x3c($v0)
-/* A2C374 80242134 3C014316 */  lui       $at, 0x4316
-/* A2C378 80242138 44810000 */  mtc1      $at, $f0
-/* A2C37C 8024213C 2463FFFB */  addiu     $v1, $v1, -5
-/* A2C380 80242140 44831000 */  mtc1      $v1, $f2
-/* A2C384 80242144 00000000 */  nop
-/* A2C388 80242148 468010A0 */  cvt.s.w   $f2, $f2
-/* A2C38C 8024214C 46002101 */  sub.s     $f4, $f4, $f0
-/* A2C390 80242150 E7A20010 */  swc1      $f2, 0x10($sp)
-/* A2C394 80242154 C6600094 */  lwc1      $f0, 0x94($s3)
-/* A2C398 80242158 46800020 */  cvt.s.w   $f0, $f0
-/* A2C39C 8024215C 46040000 */  add.s     $f0, $f0, $f4
-/* A2C3A0 80242160 24040001 */  addiu     $a0, $zero, 1
-/* A2C3A4 80242164 44073000 */  mfc1      $a3, $f6
-/* A2C3A8 80242168 46044200 */  add.s     $f8, $f8, $f4
-/* A2C3AC 8024216C E7A00014 */  swc1      $f0, 0x14($sp)
-/* A2C3B0 80242170 8E630098 */  lw        $v1, 0x98($s3)
-/* A2C3B4 80242174 44064000 */  mfc1      $a2, $f8
-/* A2C3B8 80242178 24020005 */  addiu     $v0, $zero, 5
-/* A2C3BC 8024217C AFA20020 */  sw        $v0, 0x20($sp)
-/* A2C3C0 80242180 24020014 */  addiu     $v0, $zero, 0x14
-/* A2C3C4 80242184 AFA0001C */  sw        $zero, 0x1c($sp)
-/* A2C3C8 80242188 AFA20024 */  sw        $v0, 0x24($sp)
-/* A2C3CC 8024218C 2463FFE2 */  addiu     $v1, $v1, -0x1e
-/* A2C3D0 80242190 44830000 */  mtc1      $v1, $f0
-/* A2C3D4 80242194 00000000 */  nop
-/* A2C3D8 80242198 46800020 */  cvt.s.w   $f0, $f0
-/* A2C3DC 8024219C 0C01C34C */  jal       fx_fire_breath
-/* A2C3E0 802421A0 E7A00018 */   swc1     $f0, 0x18($sp)
-.L802421A4:
-/* A2C3E4 802421A4 3C038025 */  lui       $v1, %hi(D_80249A70_A33CB0)
-/* A2C3E8 802421A8 24639A70 */  addiu     $v1, $v1, %lo(D_80249A70_A33CB0)
-/* A2C3EC 802421AC 8C640000 */  lw        $a0, ($v1)
-/* A2C3F0 802421B0 24840001 */  addiu     $a0, $a0, 1
-/* A2C3F4 802421B4 28820029 */  slti      $v0, $a0, 0x29
-/* A2C3F8 802421B8 AC640000 */  sw        $a0, ($v1)
-/* A2C3FC 802421BC 8FBF0038 */  lw        $ra, 0x38($sp)
-/* A2C400 802421C0 8FB30034 */  lw        $s3, 0x34($sp)
-/* A2C404 802421C4 8FB20030 */  lw        $s2, 0x30($sp)
-/* A2C408 802421C8 8FB1002C */  lw        $s1, 0x2c($sp)
-/* A2C40C 802421CC 8FB00028 */  lw        $s0, 0x28($sp)
-/* A2C410 802421D0 D7B40040 */  ldc1      $f20, 0x40($sp)
-/* A2C414 802421D4 38420001 */  xori      $v0, $v0, 1
-/* A2C418 802421D8 03E00008 */  jr        $ra
-/* A2C41C 802421DC 27BD0048 */   addiu    $sp, $sp, 0x48
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s
index 12c2b4345b..95948784fb 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s
@@ -6,11 +6,11 @@ glabel func_80240654_A39B34
 /* A39B38 80240658 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A39B3C 8024065C 10A00003 */  beqz      $a1, .L8024066C
 /* A39B40 80240660 8C86000C */   lw       $a2, 0xc($a0)
-/* A39B44 80240664 3C018024 */  lui       $at, %hi(D_80242C6C_A3C14C)
-/* A39B48 80240668 AC202C6C */  sw        $zero, %lo(D_80242C6C_A3C14C)($at)
+/* A39B44 80240664 3C018024 */  lui       $at, %hi(hos_06_ItemChoice_HasSelectedItem)
+/* A39B48 80240668 AC202C6C */  sw        $zero, %lo(hos_06_ItemChoice_HasSelectedItem)($at)
 .L8024066C:
-/* A39B4C 8024066C 3C038024 */  lui       $v1, %hi(D_80242C6C_A3C14C)
-/* A39B50 80240670 24632C6C */  addiu     $v1, $v1, %lo(D_80242C6C_A3C14C)
+/* A39B4C 8024066C 3C038024 */  lui       $v1, %hi(hos_06_ItemChoice_HasSelectedItem)
+/* A39B50 80240670 24632C6C */  addiu     $v1, $v1, %lo(hos_06_ItemChoice_HasSelectedItem)
 /* A39B54 80240674 8C620000 */  lw        $v0, ($v1)
 /* A39B58 80240678 54400003 */  bnel      $v0, $zero, .L80240688
 /* A39B5C 8024067C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240654_A39B34
 /* A39B64 80240684 0000102D */   daddu    $v0, $zero, $zero
 .L80240688:
 /* A39B68 80240688 8CC50000 */  lw        $a1, ($a2)
-/* A39B6C 8024068C 3C068024 */  lui       $a2, %hi(D_80242C70_A3C150)
+/* A39B6C 8024068C 3C068024 */  lui       $a2, %hi(hos_06_ItemChoice_SelectedItemID)
 /* A39B70 80240690 0C0B2026 */  jal       evt_set_variable
-/* A39B74 80240694 8CC62C70 */   lw       $a2, %lo(D_80242C70_A3C150)($a2)
+/* A39B74 80240694 8CC62C70 */   lw       $a2, %lo(hos_06_ItemChoice_SelectedItemID)($a2)
 /* A39B78 80240698 24020002 */  addiu     $v0, $zero, 2
 .L8024069C:
 /* A39B7C 8024069C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s
deleted file mode 100644
index 22aacbda7c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406A8_A39B88
-/* A39B88 802406A8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A39B8C 802406AC AFBF0010 */  sw        $ra, 0x10($sp)
-/* A39B90 802406B0 8C82000C */  lw        $v0, 0xc($a0)
-/* A39B94 802406B4 0C0B1EAF */  jal       evt_get_variable
-/* A39B98 802406B8 8C450000 */   lw       $a1, ($v0)
-/* A39B9C 802406BC 3C018024 */  lui       $at, %hi(D_80242C70_A3C150)
-/* A39BA0 802406C0 AC222C70 */  sw        $v0, %lo(D_80242C70_A3C150)($at)
-/* A39BA4 802406C4 24020002 */  addiu     $v0, $zero, 2
-/* A39BA8 802406C8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A39BAC 802406CC 24030001 */  addiu     $v1, $zero, 1
-/* A39BB0 802406D0 3C018024 */  lui       $at, %hi(D_80242C6C_A3C14C)
-/* A39BB4 802406D4 AC232C6C */  sw        $v1, %lo(D_80242C6C_A3C14C)($at)
-/* A39BB8 802406D8 03E00008 */  jr        $ra
-/* A39BBC 802406DC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s
index cc7aeec35f..0b434bc864 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s
@@ -6,11 +6,11 @@ glabel func_80240F7C_A3A45C
 /* A3A460 80240F80 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A3A464 80240F84 10A00003 */  beqz      $a1, .L80240F94
 /* A3A468 80240F88 8C86000C */   lw       $a2, 0xc($a0)
-/* A3A46C 80240F8C 3C018024 */  lui       $at, %hi(D_802445D0_A3DAB0)
-/* A3A470 80240F90 AC2045D0 */  sw        $zero, %lo(D_802445D0_A3DAB0)($at)
+/* A3A46C 80240F8C 3C018024 */  lui       $at, %hi(dup_hos_06_ItemChoice_HasSelectedItem)
+/* A3A470 80240F90 AC2045D0 */  sw        $zero, %lo(dup_hos_06_ItemChoice_HasSelectedItem)($at)
 .L80240F94:
-/* A3A474 80240F94 3C038024 */  lui       $v1, %hi(D_802445D0_A3DAB0)
-/* A3A478 80240F98 246345D0 */  addiu     $v1, $v1, %lo(D_802445D0_A3DAB0)
+/* A3A474 80240F94 3C038024 */  lui       $v1, %hi(dup_hos_06_ItemChoice_HasSelectedItem)
+/* A3A478 80240F98 246345D0 */  addiu     $v1, $v1, %lo(dup_hos_06_ItemChoice_HasSelectedItem)
 /* A3A47C 80240F9C 8C620000 */  lw        $v0, ($v1)
 /* A3A480 80240FA0 54400003 */  bnel      $v0, $zero, .L80240FB0
 /* A3A484 80240FA4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240F7C_A3A45C
 /* A3A48C 80240FAC 0000102D */   daddu    $v0, $zero, $zero
 .L80240FB0:
 /* A3A490 80240FB0 8CC50000 */  lw        $a1, ($a2)
-/* A3A494 80240FB4 3C068024 */  lui       $a2, %hi(D_802445D4_A3DAB4)
+/* A3A494 80240FB4 3C068024 */  lui       $a2, %hi(dup_hos_06_ItemChoice_SelectedItemID)
 /* A3A498 80240FB8 0C0B2026 */  jal       evt_set_variable
-/* A3A49C 80240FBC 8CC645D4 */   lw       $a2, %lo(D_802445D4_A3DAB4)($a2)
+/* A3A49C 80240FBC 8CC645D4 */   lw       $a2, %lo(dup_hos_06_ItemChoice_SelectedItemID)($a2)
 /* A3A4A0 80240FC0 24020002 */  addiu     $v0, $zero, 2
 .L80240FC4:
 /* A3A4A4 80240FC4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240FD0_A3A4B0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240FD0_A3A4B0.s
deleted file mode 100644
index a834af704f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240FD0_A3A4B0.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240FD0_A3A4B0
-/* A3A4B0 80240FD0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A3A4B4 80240FD4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A3A4B8 80240FD8 8C82000C */  lw        $v0, 0xc($a0)
-/* A3A4BC 80240FDC 0C0B1EAF */  jal       evt_get_variable
-/* A3A4C0 80240FE0 8C450000 */   lw       $a1, ($v0)
-/* A3A4C4 80240FE4 3C018024 */  lui       $at, %hi(D_802445D4_A3DAB4)
-/* A3A4C8 80240FE8 AC2245D4 */  sw        $v0, %lo(D_802445D4_A3DAB4)($at)
-/* A3A4CC 80240FEC 24020002 */  addiu     $v0, $zero, 2
-/* A3A4D0 80240FF0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A3A4D4 80240FF4 24030001 */  addiu     $v1, $zero, 1
-/* A3A4D8 80240FF8 3C018024 */  lui       $at, %hi(D_802445D0_A3DAB0)
-/* A3A4DC 80240FFC AC2345D0 */  sw        $v1, %lo(D_802445D0_A3DAB0)($at)
-/* A3A4E0 80241000 03E00008 */  jr        $ra
-/* A3A4E4 80241004 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s
deleted file mode 100644
index 8d06ee1bef..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s
+++ /dev/null
@@ -1,177 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024126C_A3A74C
-/* A3A74C 8024126C 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* A3A750 80241270 AFBE0030 */  sw        $fp, 0x30($sp)
-/* A3A754 80241274 0080F02D */  daddu     $fp, $a0, $zero
-/* A3A758 80241278 0000202D */  daddu     $a0, $zero, $zero
-/* A3A75C 8024127C 3C05F5DE */  lui       $a1, 0xf5de
-/* A3A760 80241280 34A50180 */  ori       $a1, $a1, 0x180
-/* A3A764 80241284 AFBF0034 */  sw        $ra, 0x34($sp)
-/* A3A768 80241288 AFB7002C */  sw        $s7, 0x2c($sp)
-/* A3A76C 8024128C AFB60028 */  sw        $s6, 0x28($sp)
-/* A3A770 80241290 AFB50024 */  sw        $s5, 0x24($sp)
-/* A3A774 80241294 AFB40020 */  sw        $s4, 0x20($sp)
-/* A3A778 80241298 AFB3001C */  sw        $s3, 0x1c($sp)
-/* A3A77C 8024129C AFB20018 */  sw        $s2, 0x18($sp)
-/* A3A780 802412A0 AFB10014 */  sw        $s1, 0x14($sp)
-/* A3A784 802412A4 0C0B1EAF */  jal       evt_get_variable
-/* A3A788 802412A8 AFB00010 */   sw       $s0, 0x10($sp)
-/* A3A78C 802412AC 0040B02D */  daddu     $s6, $v0, $zero
-/* A3A790 802412B0 0000A02D */  daddu     $s4, $zero, $zero
-/* A3A794 802412B4 0280802D */  daddu     $s0, $s4, $zero
-/* A3A798 802412B8 3C12F971 */  lui       $s2, 0xf971
-/* A3A79C 802412BC 36528883 */  ori       $s2, $s2, 0x8883
-/* A3A7A0 802412C0 3C118024 */  lui       $s1, %hi(D_802447D8_A3DCB8)
-/* A3A7A4 802412C4 263147D8 */  addiu     $s1, $s1, %lo(D_802447D8_A3DCB8)
-/* A3A7A8 802412C8 AFC00088 */  sw        $zero, 0x88($fp)
-.L802412CC:
-/* A3A7AC 802412CC 8E220004 */  lw        $v0, 4($s1)
-/* A3A7B0 802412D0 02C2102A */  slt       $v0, $s6, $v0
-/* A3A7B4 802412D4 5440000C */  bnel      $v0, $zero, .L80241308
-/* A3A7B8 802412D8 26100001 */   addiu    $s0, $s0, 1
-/* A3A7BC 802412DC 8E240000 */  lw        $a0, ($s1)
-/* A3A7C0 802412E0 0C09046F */  jal       func_802411BC_A3A69C
-/* A3A7C4 802412E4 00000000 */   nop
-/* A3A7C8 802412E8 54400007 */  bnel      $v0, $zero, .L80241308
-/* A3A7CC 802412EC 26100001 */   addiu    $s0, $s0, 1
-/* A3A7D0 802412F0 0000202D */  daddu     $a0, $zero, $zero
-/* A3A7D4 802412F4 0C0B1EAF */  jal       evt_get_variable
-/* A3A7D8 802412F8 02122821 */   addu     $a1, $s0, $s2
-/* A3A7DC 802412FC 50400001 */  beql      $v0, $zero, .L80241304
-/* A3A7E0 80241300 26940001 */   addiu    $s4, $s4, 1
-.L80241304:
-/* A3A7E4 80241304 26100001 */  addiu     $s0, $s0, 1
-.L80241308:
-/* A3A7E8 80241308 2E02004F */  sltiu     $v0, $s0, 0x4f
-/* A3A7EC 8024130C 1440FFEF */  bnez      $v0, .L802412CC
-/* A3A7F0 80241310 2631000C */   addiu    $s1, $s1, 0xc
-/* A3A7F4 80241314 3C118024 */  lui       $s1, %hi(D_802447D4_A3DCB4)
-/* A3A7F8 80241318 263147D4 */  addiu     $s1, $s1, %lo(D_802447D4_A3DCB4)
-/* A3A7FC 8024131C 1280002D */  beqz      $s4, .L802413D4
-/* A3A800 80241320 0000802D */   daddu    $s0, $zero, $zero
-/* A3A804 80241324 0C00A67F */  jal       rand_int
-/* A3A808 80241328 2684FFFF */   addiu    $a0, $s4, -1
-/* A3A80C 8024132C 0040A82D */  daddu     $s5, $v0, $zero
-/* A3A810 80241330 0220982D */  daddu     $s3, $s1, $zero
-/* A3A814 80241334 0000A02D */  daddu     $s4, $zero, $zero
-/* A3A818 80241338 0280802D */  daddu     $s0, $s4, $zero
-/* A3A81C 8024133C 3C17F971 */  lui       $s7, 0xf971
-/* A3A820 80241340 36F78883 */  ori       $s7, $s7, 0x8883
-/* A3A824 80241344 26720004 */  addiu     $s2, $s3, 4
-.L80241348:
-/* A3A828 80241348 8E420004 */  lw        $v0, 4($s2)
-/* A3A82C 8024134C 02C2102A */  slt       $v0, $s6, $v0
-/* A3A830 80241350 5440000F */  bnel      $v0, $zero, .L80241390
-/* A3A834 80241354 26100001 */   addiu    $s0, $s0, 1
-/* A3A838 80241358 8E440000 */  lw        $a0, ($s2)
-/* A3A83C 8024135C 0C09046F */  jal       func_802411BC_A3A69C
-/* A3A840 80241360 00000000 */   nop
-/* A3A844 80241364 5440000A */  bnel      $v0, $zero, .L80241390
-/* A3A848 80241368 26100001 */   addiu    $s0, $s0, 1
-/* A3A84C 8024136C 0000202D */  daddu     $a0, $zero, $zero
-/* A3A850 80241370 02178821 */  addu      $s1, $s0, $s7
-/* A3A854 80241374 0C0B1EAF */  jal       evt_get_variable
-/* A3A858 80241378 0220282D */   daddu    $a1, $s1, $zero
-/* A3A85C 8024137C 54400004 */  bnel      $v0, $zero, .L80241390
-/* A3A860 80241380 26100001 */   addiu    $s0, $s0, 1
-/* A3A864 80241384 12950008 */  beq       $s4, $s5, .L802413A8
-/* A3A868 80241388 26940001 */   addiu    $s4, $s4, 1
-/* A3A86C 8024138C 26100001 */  addiu     $s0, $s0, 1
-.L80241390:
-/* A3A870 80241390 2652000C */  addiu     $s2, $s2, 0xc
-/* A3A874 80241394 2E02004F */  sltiu     $v0, $s0, 0x4f
-/* A3A878 80241398 1440FFEB */  bnez      $v0, .L80241348
-/* A3A87C 8024139C 2673000C */   addiu    $s3, $s3, 0xc
-/* A3A880 802413A0 0809052D */  j         .L802414B4
-/* A3A884 802413A4 24020002 */   addiu    $v0, $zero, 2
-.L802413A8:
-/* A3A888 802413A8 0000202D */  daddu     $a0, $zero, $zero
-/* A3A88C 802413AC 080904EF */  j         .L802413BC
-/* A3A890 802413B0 0220282D */   daddu    $a1, $s1, $zero
-.L802413B4:
-/* A3A894 802413B4 0000202D */  daddu     $a0, $zero, $zero
-/* A3A898 802413B8 0240282D */  daddu     $a1, $s2, $zero
-.L802413BC:
-/* A3A89C 802413BC 8E620000 */  lw        $v0, ($s3)
-/* A3A8A0 802413C0 24060001 */  addiu     $a2, $zero, 1
-/* A3A8A4 802413C4 0C0B2026 */  jal       evt_set_variable
-/* A3A8A8 802413C8 AFC20088 */   sw       $v0, 0x88($fp)
-/* A3A8AC 802413CC 0809052D */  j         .L802414B4
-/* A3A8B0 802413D0 24020002 */   addiu    $v0, $zero, 2
-.L802413D4:
-/* A3A8B4 802413D4 24132712 */  addiu     $s3, $zero, 0x2712
-/* A3A8B8 802413D8 3C12F971 */  lui       $s2, 0xf971
-/* A3A8BC 802413DC 36528883 */  ori       $s2, $s2, 0x8883
-/* A3A8C0 802413E0 26310004 */  addiu     $s1, $s1, 4
-.L802413E4:
-/* A3A8C4 802413E4 8E220004 */  lw        $v0, 4($s1)
-/* A3A8C8 802413E8 5453000C */  bnel      $v0, $s3, .L8024141C
-/* A3A8CC 802413EC 26100001 */   addiu    $s0, $s0, 1
-/* A3A8D0 802413F0 8E240000 */  lw        $a0, ($s1)
-/* A3A8D4 802413F4 0C09046F */  jal       func_802411BC_A3A69C
-/* A3A8D8 802413F8 00000000 */   nop
-/* A3A8DC 802413FC 54400007 */  bnel      $v0, $zero, .L8024141C
-/* A3A8E0 80241400 26100001 */   addiu    $s0, $s0, 1
-/* A3A8E4 80241404 0000202D */  daddu     $a0, $zero, $zero
-/* A3A8E8 80241408 0C0B1EAF */  jal       evt_get_variable
-/* A3A8EC 8024140C 02122821 */   addu     $a1, $s0, $s2
-/* A3A8F0 80241410 50400001 */  beql      $v0, $zero, .L80241418
-/* A3A8F4 80241414 26940001 */   addiu    $s4, $s4, 1
-.L80241418:
-/* A3A8F8 80241418 26100001 */  addiu     $s0, $s0, 1
-.L8024141C:
-/* A3A8FC 8024141C 2E02004F */  sltiu     $v0, $s0, 0x4f
-/* A3A900 80241420 1440FFF0 */  bnez      $v0, .L802413E4
-/* A3A904 80241424 2631000C */   addiu    $s1, $s1, 0xc
-/* A3A908 80241428 12800022 */  beqz      $s4, .L802414B4
-/* A3A90C 8024142C 24020002 */   addiu    $v0, $zero, 2
-/* A3A910 80241430 0C00A67F */  jal       rand_int
-/* A3A914 80241434 2684FFFF */   addiu    $a0, $s4, -1
-/* A3A918 80241438 0040A82D */  daddu     $s5, $v0, $zero
-/* A3A91C 8024143C 3C138024 */  lui       $s3, %hi(D_802447D4_A3DCB4)
-/* A3A920 80241440 267347D4 */  addiu     $s3, $s3, %lo(D_802447D4_A3DCB4)
-/* A3A924 80241444 0000A02D */  daddu     $s4, $zero, $zero
-/* A3A928 80241448 0280802D */  daddu     $s0, $s4, $zero
-/* A3A92C 8024144C 24172712 */  addiu     $s7, $zero, 0x2712
-/* A3A930 80241450 3C16F971 */  lui       $s6, 0xf971
-/* A3A934 80241454 36D68883 */  ori       $s6, $s6, 0x8883
-/* A3A938 80241458 26710004 */  addiu     $s1, $s3, 4
-.L8024145C:
-/* A3A93C 8024145C 8E220004 */  lw        $v0, 4($s1)
-/* A3A940 80241460 5457000F */  bnel      $v0, $s7, .L802414A0
-/* A3A944 80241464 26100001 */   addiu    $s0, $s0, 1
-/* A3A948 80241468 8E240000 */  lw        $a0, ($s1)
-/* A3A94C 8024146C 0C09046F */  jal       func_802411BC_A3A69C
-/* A3A950 80241470 00000000 */   nop
-/* A3A954 80241474 5440000A */  bnel      $v0, $zero, .L802414A0
-/* A3A958 80241478 26100001 */   addiu    $s0, $s0, 1
-/* A3A95C 8024147C 0000202D */  daddu     $a0, $zero, $zero
-/* A3A960 80241480 02169021 */  addu      $s2, $s0, $s6
-/* A3A964 80241484 0C0B1EAF */  jal       evt_get_variable
-/* A3A968 80241488 0240282D */   daddu    $a1, $s2, $zero
-/* A3A96C 8024148C 54400004 */  bnel      $v0, $zero, .L802414A0
-/* A3A970 80241490 26100001 */   addiu    $s0, $s0, 1
-/* A3A974 80241494 1295FFC7 */  beq       $s4, $s5, .L802413B4
-/* A3A978 80241498 26940001 */   addiu    $s4, $s4, 1
-/* A3A97C 8024149C 26100001 */  addiu     $s0, $s0, 1
-.L802414A0:
-/* A3A980 802414A0 2631000C */  addiu     $s1, $s1, 0xc
-/* A3A984 802414A4 2E02004F */  sltiu     $v0, $s0, 0x4f
-/* A3A988 802414A8 1440FFEC */  bnez      $v0, .L8024145C
-/* A3A98C 802414AC 2673000C */   addiu    $s3, $s3, 0xc
-/* A3A990 802414B0 24020002 */  addiu     $v0, $zero, 2
-.L802414B4:
-/* A3A994 802414B4 8FBF0034 */  lw        $ra, 0x34($sp)
-/* A3A998 802414B8 8FBE0030 */  lw        $fp, 0x30($sp)
-/* A3A99C 802414BC 8FB7002C */  lw        $s7, 0x2c($sp)
-/* A3A9A0 802414C0 8FB60028 */  lw        $s6, 0x28($sp)
-/* A3A9A4 802414C4 8FB50024 */  lw        $s5, 0x24($sp)
-/* A3A9A8 802414C8 8FB40020 */  lw        $s4, 0x20($sp)
-/* A3A9AC 802414CC 8FB3001C */  lw        $s3, 0x1c($sp)
-/* A3A9B0 802414D0 8FB20018 */  lw        $s2, 0x18($sp)
-/* A3A9B4 802414D4 8FB10014 */  lw        $s1, 0x14($sp)
-/* A3A9B8 802414D8 8FB00010 */  lw        $s0, 0x10($sp)
-/* A3A9BC 802414DC 03E00008 */  jr        $ra
-/* A3A9C0 802414E0 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s
deleted file mode 100644
index 0c5451cd0d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s
+++ /dev/null
@@ -1,108 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414E4_A3A9C4
-/* A3A9C4 802414E4 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* A3A9C8 802414E8 AFBE0030 */  sw        $fp, 0x30($sp)
-/* A3A9CC 802414EC 0080F02D */  daddu     $fp, $a0, $zero
-/* A3A9D0 802414F0 0000202D */  daddu     $a0, $zero, $zero
-/* A3A9D4 802414F4 3C05F5DE */  lui       $a1, 0xf5de
-/* A3A9D8 802414F8 34A50180 */  ori       $a1, $a1, 0x180
-/* A3A9DC 802414FC AFBF0034 */  sw        $ra, 0x34($sp)
-/* A3A9E0 80241500 AFB7002C */  sw        $s7, 0x2c($sp)
-/* A3A9E4 80241504 AFB60028 */  sw        $s6, 0x28($sp)
-/* A3A9E8 80241508 AFB50024 */  sw        $s5, 0x24($sp)
-/* A3A9EC 8024150C AFB40020 */  sw        $s4, 0x20($sp)
-/* A3A9F0 80241510 AFB3001C */  sw        $s3, 0x1c($sp)
-/* A3A9F4 80241514 AFB20018 */  sw        $s2, 0x18($sp)
-/* A3A9F8 80241518 AFB10014 */  sw        $s1, 0x14($sp)
-/* A3A9FC 8024151C 0C0B1EAF */  jal       evt_get_variable
-/* A3AA00 80241520 AFB00010 */   sw       $s0, 0x10($sp)
-/* A3AA04 80241524 0040A82D */  daddu     $s5, $v0, $zero
-/* A3AA08 80241528 0000A02D */  daddu     $s4, $zero, $zero
-/* A3AA0C 8024152C 0280802D */  daddu     $s0, $s4, $zero
-/* A3AA10 80241530 3C12F971 */  lui       $s2, 0xf971
-/* A3AA14 80241534 365288E4 */  ori       $s2, $s2, 0x88e4
-/* A3AA18 80241538 3C118024 */  lui       $s1, %hi(D_80244B8C_A3E06C)
-/* A3AA1C 8024153C 26314B8C */  addiu     $s1, $s1, %lo(D_80244B8C_A3E06C)
-/* A3AA20 80241540 AFC00088 */  sw        $zero, 0x88($fp)
-.L80241544:
-/* A3AA24 80241544 8E220004 */  lw        $v0, 4($s1)
-/* A3AA28 80241548 02A2102A */  slt       $v0, $s5, $v0
-/* A3AA2C 8024154C 5440000C */  bnel      $v0, $zero, .L80241580
-/* A3AA30 80241550 26100001 */   addiu    $s0, $s0, 1
-/* A3AA34 80241554 8E250000 */  lw        $a1, ($s1)
-/* A3AA38 80241558 0C0B1EAF */  jal       evt_get_variable
-/* A3AA3C 8024155C 0000202D */   daddu    $a0, $zero, $zero
-/* A3AA40 80241560 54400007 */  bnel      $v0, $zero, .L80241580
-/* A3AA44 80241564 26100001 */   addiu    $s0, $s0, 1
-/* A3AA48 80241568 0000202D */  daddu     $a0, $zero, $zero
-/* A3AA4C 8024156C 0C0B1EAF */  jal       evt_get_variable
-/* A3AA50 80241570 02122821 */   addu     $a1, $s0, $s2
-/* A3AA54 80241574 50400001 */  beql      $v0, $zero, .L8024157C
-/* A3AA58 80241578 26940001 */   addiu    $s4, $s4, 1
-.L8024157C:
-/* A3AA5C 8024157C 26100001 */  addiu     $s0, $s0, 1
-.L80241580:
-/* A3AA60 80241580 2E020010 */  sltiu     $v0, $s0, 0x10
-/* A3AA64 80241584 1440FFEF */  bnez      $v0, .L80241544
-/* A3AA68 80241588 2631000C */   addiu    $s1, $s1, 0xc
-/* A3AA6C 8024158C 12800029 */  beqz      $s4, .L80241634
-/* A3AA70 80241590 00000000 */   nop
-/* A3AA74 80241594 0C00A67F */  jal       rand_int
-/* A3AA78 80241598 2684FFFF */   addiu    $a0, $s4, -1
-/* A3AA7C 8024159C 0040B82D */  daddu     $s7, $v0, $zero
-/* A3AA80 802415A0 3C138024 */  lui       $s3, %hi(D_80244B88_A3E068)
-/* A3AA84 802415A4 26734B88 */  addiu     $s3, $s3, %lo(D_80244B88_A3E068)
-/* A3AA88 802415A8 0000A02D */  daddu     $s4, $zero, $zero
-/* A3AA8C 802415AC 0280802D */  daddu     $s0, $s4, $zero
-/* A3AA90 802415B0 3C16F971 */  lui       $s6, 0xf971
-/* A3AA94 802415B4 36D688E4 */  ori       $s6, $s6, 0x88e4
-/* A3AA98 802415B8 26720004 */  addiu     $s2, $s3, 4
-.L802415BC:
-/* A3AA9C 802415BC 8E420004 */  lw        $v0, 4($s2)
-/* A3AAA0 802415C0 02A2102A */  slt       $v0, $s5, $v0
-/* A3AAA4 802415C4 54400017 */  bnel      $v0, $zero, .L80241624
-/* A3AAA8 802415C8 26100001 */   addiu    $s0, $s0, 1
-/* A3AAAC 802415CC 8E450000 */  lw        $a1, ($s2)
-/* A3AAB0 802415D0 0C0B1EAF */  jal       evt_get_variable
-/* A3AAB4 802415D4 0000202D */   daddu    $a0, $zero, $zero
-/* A3AAB8 802415D8 54400012 */  bnel      $v0, $zero, .L80241624
-/* A3AABC 802415DC 26100001 */   addiu    $s0, $s0, 1
-/* A3AAC0 802415E0 0000202D */  daddu     $a0, $zero, $zero
-/* A3AAC4 802415E4 02168821 */  addu      $s1, $s0, $s6
-/* A3AAC8 802415E8 0C0B1EAF */  jal       evt_get_variable
-/* A3AACC 802415EC 0220282D */   daddu    $a1, $s1, $zero
-/* A3AAD0 802415F0 5440000C */  bnel      $v0, $zero, .L80241624
-/* A3AAD4 802415F4 26100001 */   addiu    $s0, $s0, 1
-/* A3AAD8 802415F8 16970009 */  bne       $s4, $s7, .L80241620
-/* A3AADC 802415FC 26940001 */   addiu    $s4, $s4, 1
-/* A3AAE0 80241600 0000202D */  daddu     $a0, $zero, $zero
-/* A3AAE4 80241604 0220282D */  daddu     $a1, $s1, $zero
-/* A3AAE8 80241608 8E620000 */  lw        $v0, ($s3)
-/* A3AAEC 8024160C 24060001 */  addiu     $a2, $zero, 1
-/* A3AAF0 80241610 0C0B2026 */  jal       evt_set_variable
-/* A3AAF4 80241614 AFC20088 */   sw       $v0, 0x88($fp)
-/* A3AAF8 80241618 0809058D */  j         .L80241634
-/* A3AAFC 8024161C 00000000 */   nop
-.L80241620:
-/* A3AB00 80241620 26100001 */  addiu     $s0, $s0, 1
-.L80241624:
-/* A3AB04 80241624 2652000C */  addiu     $s2, $s2, 0xc
-/* A3AB08 80241628 2E020010 */  sltiu     $v0, $s0, 0x10
-/* A3AB0C 8024162C 1440FFE3 */  bnez      $v0, .L802415BC
-/* A3AB10 80241630 2673000C */   addiu    $s3, $s3, 0xc
-.L80241634:
-/* A3AB14 80241634 8FBF0034 */  lw        $ra, 0x34($sp)
-/* A3AB18 80241638 8FBE0030 */  lw        $fp, 0x30($sp)
-/* A3AB1C 8024163C 8FB7002C */  lw        $s7, 0x2c($sp)
-/* A3AB20 80241640 8FB60028 */  lw        $s6, 0x28($sp)
-/* A3AB24 80241644 8FB50024 */  lw        $s5, 0x24($sp)
-/* A3AB28 80241648 8FB40020 */  lw        $s4, 0x20($sp)
-/* A3AB2C 8024164C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* A3AB30 80241650 8FB20018 */  lw        $s2, 0x18($sp)
-/* A3AB34 80241654 8FB10014 */  lw        $s1, 0x14($sp)
-/* A3AB38 80241658 8FB00010 */  lw        $s0, 0x10($sp)
-/* A3AB3C 8024165C 24020002 */  addiu     $v0, $zero, 2
-/* A3AB40 80241660 03E00008 */  jr        $ra
-/* A3AB44 80241664 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s b/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s
deleted file mode 100644
index 3e98ab3aae..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s
+++ /dev/null
@@ -1,108 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241668_A3AB48
-/* A3AB48 80241668 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* A3AB4C 8024166C AFBE0030 */  sw        $fp, 0x30($sp)
-/* A3AB50 80241670 0080F02D */  daddu     $fp, $a0, $zero
-/* A3AB54 80241674 0000202D */  daddu     $a0, $zero, $zero
-/* A3AB58 80241678 3C05F5DE */  lui       $a1, 0xf5de
-/* A3AB5C 8024167C 34A50180 */  ori       $a1, $a1, 0x180
-/* A3AB60 80241680 AFBF0034 */  sw        $ra, 0x34($sp)
-/* A3AB64 80241684 AFB7002C */  sw        $s7, 0x2c($sp)
-/* A3AB68 80241688 AFB60028 */  sw        $s6, 0x28($sp)
-/* A3AB6C 8024168C AFB50024 */  sw        $s5, 0x24($sp)
-/* A3AB70 80241690 AFB40020 */  sw        $s4, 0x20($sp)
-/* A3AB74 80241694 AFB3001C */  sw        $s3, 0x1c($sp)
-/* A3AB78 80241698 AFB20018 */  sw        $s2, 0x18($sp)
-/* A3AB7C 8024169C AFB10014 */  sw        $s1, 0x14($sp)
-/* A3AB80 802416A0 0C0B1EAF */  jal       evt_get_variable
-/* A3AB84 802416A4 AFB00010 */   sw       $s0, 0x10($sp)
-/* A3AB88 802416A8 0040A82D */  daddu     $s5, $v0, $zero
-/* A3AB8C 802416AC 0000A02D */  daddu     $s4, $zero, $zero
-/* A3AB90 802416B0 0280802D */  daddu     $s0, $s4, $zero
-/* A3AB94 802416B4 3C12F971 */  lui       $s2, 0xf971
-/* A3AB98 802416B8 365288F4 */  ori       $s2, $s2, 0x88f4
-/* A3AB9C 802416BC 3C118024 */  lui       $s1, %hi(D_80244C4C_A3E12C)
-/* A3ABA0 802416C0 26314C4C */  addiu     $s1, $s1, %lo(D_80244C4C_A3E12C)
-/* A3ABA4 802416C4 AFC00088 */  sw        $zero, 0x88($fp)
-.L802416C8:
-/* A3ABA8 802416C8 8E220004 */  lw        $v0, 4($s1)
-/* A3ABAC 802416CC 02A2102A */  slt       $v0, $s5, $v0
-/* A3ABB0 802416D0 5440000C */  bnel      $v0, $zero, .L80241704
-/* A3ABB4 802416D4 26100001 */   addiu    $s0, $s0, 1
-/* A3ABB8 802416D8 8E250000 */  lw        $a1, ($s1)
-/* A3ABBC 802416DC 0C0B1EAF */  jal       evt_get_variable
-/* A3ABC0 802416E0 0000202D */   daddu    $a0, $zero, $zero
-/* A3ABC4 802416E4 54400007 */  bnel      $v0, $zero, .L80241704
-/* A3ABC8 802416E8 26100001 */   addiu    $s0, $s0, 1
-/* A3ABCC 802416EC 0000202D */  daddu     $a0, $zero, $zero
-/* A3ABD0 802416F0 0C0B1EAF */  jal       evt_get_variable
-/* A3ABD4 802416F4 02122821 */   addu     $a1, $s0, $s2
-/* A3ABD8 802416F8 50400001 */  beql      $v0, $zero, .L80241700
-/* A3ABDC 802416FC 26940001 */   addiu    $s4, $s4, 1
-.L80241700:
-/* A3ABE0 80241700 26100001 */  addiu     $s0, $s0, 1
-.L80241704:
-/* A3ABE4 80241704 2E02003F */  sltiu     $v0, $s0, 0x3f
-/* A3ABE8 80241708 1440FFEF */  bnez      $v0, .L802416C8
-/* A3ABEC 8024170C 2631000C */   addiu    $s1, $s1, 0xc
-/* A3ABF0 80241710 12800029 */  beqz      $s4, .L802417B8
-/* A3ABF4 80241714 00000000 */   nop
-/* A3ABF8 80241718 0C00A67F */  jal       rand_int
-/* A3ABFC 8024171C 2684FFFF */   addiu    $a0, $s4, -1
-/* A3AC00 80241720 0040B82D */  daddu     $s7, $v0, $zero
-/* A3AC04 80241724 3C138024 */  lui       $s3, %hi(D_80244C48_A3E128)
-/* A3AC08 80241728 26734C48 */  addiu     $s3, $s3, %lo(D_80244C48_A3E128)
-/* A3AC0C 8024172C 0000A02D */  daddu     $s4, $zero, $zero
-/* A3AC10 80241730 0280802D */  daddu     $s0, $s4, $zero
-/* A3AC14 80241734 3C16F971 */  lui       $s6, 0xf971
-/* A3AC18 80241738 36D688F4 */  ori       $s6, $s6, 0x88f4
-/* A3AC1C 8024173C 26720004 */  addiu     $s2, $s3, 4
-.L80241740:
-/* A3AC20 80241740 8E420004 */  lw        $v0, 4($s2)
-/* A3AC24 80241744 02A2102A */  slt       $v0, $s5, $v0
-/* A3AC28 80241748 54400017 */  bnel      $v0, $zero, .L802417A8
-/* A3AC2C 8024174C 26100001 */   addiu    $s0, $s0, 1
-/* A3AC30 80241750 8E450000 */  lw        $a1, ($s2)
-/* A3AC34 80241754 0C0B1EAF */  jal       evt_get_variable
-/* A3AC38 80241758 0000202D */   daddu    $a0, $zero, $zero
-/* A3AC3C 8024175C 54400012 */  bnel      $v0, $zero, .L802417A8
-/* A3AC40 80241760 26100001 */   addiu    $s0, $s0, 1
-/* A3AC44 80241764 0000202D */  daddu     $a0, $zero, $zero
-/* A3AC48 80241768 02168821 */  addu      $s1, $s0, $s6
-/* A3AC4C 8024176C 0C0B1EAF */  jal       evt_get_variable
-/* A3AC50 80241770 0220282D */   daddu    $a1, $s1, $zero
-/* A3AC54 80241774 5440000C */  bnel      $v0, $zero, .L802417A8
-/* A3AC58 80241778 26100001 */   addiu    $s0, $s0, 1
-/* A3AC5C 8024177C 16970009 */  bne       $s4, $s7, .L802417A4
-/* A3AC60 80241780 26940001 */   addiu    $s4, $s4, 1
-/* A3AC64 80241784 0000202D */  daddu     $a0, $zero, $zero
-/* A3AC68 80241788 0220282D */  daddu     $a1, $s1, $zero
-/* A3AC6C 8024178C 8E620000 */  lw        $v0, ($s3)
-/* A3AC70 80241790 24060001 */  addiu     $a2, $zero, 1
-/* A3AC74 80241794 0C0B2026 */  jal       evt_set_variable
-/* A3AC78 80241798 AFC20088 */   sw       $v0, 0x88($fp)
-/* A3AC7C 8024179C 080905EE */  j         .L802417B8
-/* A3AC80 802417A0 00000000 */   nop
-.L802417A4:
-/* A3AC84 802417A4 26100001 */  addiu     $s0, $s0, 1
-.L802417A8:
-/* A3AC88 802417A8 2652000C */  addiu     $s2, $s2, 0xc
-/* A3AC8C 802417AC 2E02003F */  sltiu     $v0, $s0, 0x3f
-/* A3AC90 802417B0 1440FFE3 */  bnez      $v0, .L80241740
-/* A3AC94 802417B4 2673000C */   addiu    $s3, $s3, 0xc
-.L802417B8:
-/* A3AC98 802417B8 8FBF0034 */  lw        $ra, 0x34($sp)
-/* A3AC9C 802417BC 8FBE0030 */  lw        $fp, 0x30($sp)
-/* A3ACA0 802417C0 8FB7002C */  lw        $s7, 0x2c($sp)
-/* A3ACA4 802417C4 8FB60028 */  lw        $s6, 0x28($sp)
-/* A3ACA8 802417C8 8FB50024 */  lw        $s5, 0x24($sp)
-/* A3ACAC 802417CC 8FB40020 */  lw        $s4, 0x20($sp)
-/* A3ACB0 802417D0 8FB3001C */  lw        $s3, 0x1c($sp)
-/* A3ACB4 802417D4 8FB20018 */  lw        $s2, 0x18($sp)
-/* A3ACB8 802417D8 8FB10014 */  lw        $s1, 0x14($sp)
-/* A3ACBC 802417DC 8FB00010 */  lw        $s0, 0x10($sp)
-/* A3ACC0 802417E0 24020002 */  addiu     $v0, $zero, 2
-/* A3ACC4 802417E4 03E00008 */  jr        $ra
-/* A3ACC8 802417E8 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s
index 85495a3ccf..a2fb6b2ab3 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s
@@ -6,11 +6,11 @@ glabel func_802414EC_B2D95C
 /* B2D960 802414F0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* B2D964 802414F4 10A00003 */  beqz      $a1, .L80241504
 /* B2D968 802414F8 8C86000C */   lw       $a2, 0xc($a0)
-/* B2D96C 802414FC 3C018024 */  lui       $at, %hi(D_80243048_B2F4B8)
-/* B2D970 80241500 AC203048 */  sw        $zero, %lo(D_80243048_B2F4B8)($at)
+/* B2D96C 802414FC 3C018024 */  lui       $at, %hi(jan_02_ItemChoice_HasSelectedItem)
+/* B2D970 80241500 AC203048 */  sw        $zero, %lo(jan_02_ItemChoice_HasSelectedItem)($at)
 .L80241504:
-/* B2D974 80241504 3C038024 */  lui       $v1, %hi(D_80243048_B2F4B8)
-/* B2D978 80241508 24633048 */  addiu     $v1, $v1, %lo(D_80243048_B2F4B8)
+/* B2D974 80241504 3C038024 */  lui       $v1, %hi(jan_02_ItemChoice_HasSelectedItem)
+/* B2D978 80241508 24633048 */  addiu     $v1, $v1, %lo(jan_02_ItemChoice_HasSelectedItem)
 /* B2D97C 8024150C 8C620000 */  lw        $v0, ($v1)
 /* B2D980 80241510 54400003 */  bnel      $v0, $zero, .L80241520
 /* B2D984 80241514 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802414EC_B2D95C
 /* B2D98C 8024151C 0000102D */   daddu    $v0, $zero, $zero
 .L80241520:
 /* B2D990 80241520 8CC50000 */  lw        $a1, ($a2)
-/* B2D994 80241524 3C068024 */  lui       $a2, %hi(D_8024304C_B2F4BC)
+/* B2D994 80241524 3C068024 */  lui       $a2, %hi(jan_02_ItemChoice_SelectedItemID)
 /* B2D998 80241528 0C0B2026 */  jal       evt_set_variable
-/* B2D99C 8024152C 8CC6304C */   lw       $a2, %lo(D_8024304C_B2F4BC)($a2)
+/* B2D99C 8024152C 8CC6304C */   lw       $a2, %lo(jan_02_ItemChoice_SelectedItemID)($a2)
 /* B2D9A0 80241530 24020002 */  addiu     $v0, $zero, 2
 .L80241534:
 /* B2D9A4 80241534 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241540_B2D9B0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241540_B2D9B0.s
deleted file mode 100644
index 3c44d9ac19..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241540_B2D9B0.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241540_B2D9B0
-/* B2D9B0 80241540 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B2D9B4 80241544 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B2D9B8 80241548 8C82000C */  lw        $v0, 0xc($a0)
-/* B2D9BC 8024154C 0C0B1EAF */  jal       evt_get_variable
-/* B2D9C0 80241550 8C450000 */   lw       $a1, ($v0)
-/* B2D9C4 80241554 3C018024 */  lui       $at, %hi(D_8024304C_B2F4BC)
-/* B2D9C8 80241558 AC22304C */  sw        $v0, %lo(D_8024304C_B2F4BC)($at)
-/* B2D9CC 8024155C 24020002 */  addiu     $v0, $zero, 2
-/* B2D9D0 80241560 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B2D9D4 80241564 24030001 */  addiu     $v1, $zero, 1
-/* B2D9D8 80241568 3C018024 */  lui       $at, %hi(D_80243048_B2F4B8)
-/* B2D9DC 8024156C AC233048 */  sw        $v1, %lo(D_80243048_B2F4B8)($at)
-/* B2D9E0 80241570 03E00008 */  jr        $ra
-/* B2D9E4 80241574 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s
index 8eea8b8ebb..1ac6e16a52 100644
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s
+++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s
@@ -6,11 +6,11 @@ glabel func_802419D8_B365A8
 /* B365AC 802419DC AFBF0010 */  sw        $ra, 0x10($sp)
 /* B365B0 802419E0 10A00003 */  beqz      $a1, .L802419F0
 /* B365B4 802419E4 8C86000C */   lw       $a2, 0xc($a0)
-/* B365B8 802419E8 3C018024 */  lui       $at, %hi(D_80247444_B3C014)
-/* B365BC 802419EC AC207444 */  sw        $zero, %lo(D_80247444_B3C014)($at)
+/* B365B8 802419E8 3C018024 */  lui       $at, %hi(jan_03_ItemChoice_HasSelectedItem)
+/* B365BC 802419EC AC207444 */  sw        $zero, %lo(jan_03_ItemChoice_HasSelectedItem)($at)
 .L802419F0:
-/* B365C0 802419F0 3C038024 */  lui       $v1, %hi(D_80247444_B3C014)
-/* B365C4 802419F4 24637444 */  addiu     $v1, $v1, %lo(D_80247444_B3C014)
+/* B365C0 802419F0 3C038024 */  lui       $v1, %hi(jan_03_ItemChoice_HasSelectedItem)
+/* B365C4 802419F4 24637444 */  addiu     $v1, $v1, %lo(jan_03_ItemChoice_HasSelectedItem)
 /* B365C8 802419F8 8C620000 */  lw        $v0, ($v1)
 /* B365CC 802419FC 54400003 */  bnel      $v0, $zero, .L80241A0C
 /* B365D0 80241A00 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802419D8_B365A8
 /* B365D8 80241A08 0000102D */   daddu    $v0, $zero, $zero
 .L80241A0C:
 /* B365DC 80241A0C 8CC50000 */  lw        $a1, ($a2)
-/* B365E0 80241A10 3C068024 */  lui       $a2, %hi(D_80247448_B3C018)
+/* B365E0 80241A10 3C068024 */  lui       $a2, %hi(jan_03_ItemChoice_SelectedItemID)
 /* B365E4 80241A14 0C0B2026 */  jal       evt_set_variable
-/* B365E8 80241A18 8CC67448 */   lw       $a2, %lo(D_80247448_B3C018)($a2)
+/* B365E8 80241A18 8CC67448 */   lw       $a2, %lo(jan_03_ItemChoice_SelectedItemID)($a2)
 /* B365EC 80241A1C 24020002 */  addiu     $v0, $zero, 2
 .L80241A20:
 /* B365F0 80241A20 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s
deleted file mode 100644
index 20159dcdaf..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241A2C_B365FC
-/* B365FC 80241A2C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* B36600 80241A30 AFBF0010 */  sw        $ra, 0x10($sp)
-/* B36604 80241A34 8C82000C */  lw        $v0, 0xc($a0)
-/* B36608 80241A38 0C0B1EAF */  jal       evt_get_variable
-/* B3660C 80241A3C 8C450000 */   lw       $a1, ($v0)
-/* B36610 80241A40 3C018024 */  lui       $at, %hi(D_80247448_B3C018)
-/* B36614 80241A44 AC227448 */  sw        $v0, %lo(D_80247448_B3C018)($at)
-/* B36618 80241A48 24020002 */  addiu     $v0, $zero, 2
-/* B3661C 80241A4C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* B36620 80241A50 24030001 */  addiu     $v1, $zero, 1
-/* B36624 80241A54 3C018024 */  lui       $at, %hi(D_80247444_B3C014)
-/* B36628 80241A58 AC237444 */  sw        $v1, %lo(D_80247444_B3C014)($at)
-/* B3662C 80241A5C 03E00008 */  jr        $ra
-/* B36630 80241A60 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s
index b0f9339a4d..c4f690b64d 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s
@@ -6,11 +6,11 @@ glabel func_8024056C_AF320C
 /* AF3210 80240570 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AF3214 80240574 10A00003 */  beqz      $a1, .L80240584
 /* AF3218 80240578 8C86000C */   lw       $a2, 0xc($a0)
-/* AF321C 8024057C 3C018024 */  lui       $at, %hi(D_80241F10_AF4BB0)
-/* AF3220 80240580 AC201F10 */  sw        $zero, %lo(D_80241F10_AF4BB0)($at)
+/* AF321C 8024057C 3C018024 */  lui       $at, %hi(kkj_18_ItemChoice_HasSelectedItem)
+/* AF3220 80240580 AC201F10 */  sw        $zero, %lo(kkj_18_ItemChoice_HasSelectedItem)($at)
 .L80240584:
-/* AF3224 80240584 3C038024 */  lui       $v1, %hi(D_80241F10_AF4BB0)
-/* AF3228 80240588 24631F10 */  addiu     $v1, $v1, %lo(D_80241F10_AF4BB0)
+/* AF3224 80240584 3C038024 */  lui       $v1, %hi(kkj_18_ItemChoice_HasSelectedItem)
+/* AF3228 80240588 24631F10 */  addiu     $v1, $v1, %lo(kkj_18_ItemChoice_HasSelectedItem)
 /* AF322C 8024058C 8C620000 */  lw        $v0, ($v1)
 /* AF3230 80240590 54400003 */  bnel      $v0, $zero, .L802405A0
 /* AF3234 80240594 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024056C_AF320C
 /* AF323C 8024059C 0000102D */   daddu    $v0, $zero, $zero
 .L802405A0:
 /* AF3240 802405A0 8CC50000 */  lw        $a1, ($a2)
-/* AF3244 802405A4 3C068024 */  lui       $a2, %hi(D_80241F14_AF4BB4)
+/* AF3244 802405A4 3C068024 */  lui       $a2, %hi(kkj_18_ItemChoice_SelectedItemID)
 /* AF3248 802405A8 0C0B2026 */  jal       evt_set_variable
-/* AF324C 802405AC 8CC61F14 */   lw       $a2, %lo(D_80241F14_AF4BB4)($a2)
+/* AF324C 802405AC 8CC61F14 */   lw       $a2, %lo(kkj_18_ItemChoice_SelectedItemID)($a2)
 /* AF3250 802405B0 24020002 */  addiu     $v0, $zero, 2
 .L802405B4:
 /* AF3254 802405B4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s
index 95c72605ea..e630a3faf1 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s
@@ -6,11 +6,11 @@ glabel func_802404DC_AF7E2C
 /* AF7E30 802404E0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AF7E34 802404E4 10A00003 */  beqz      $a1, .L802404F4
 /* AF7E38 802404E8 8C86000C */   lw       $a2, 0xc($a0)
-/* AF7E3C 802404EC 3C018024 */  lui       $at, %hi(D_80241B10_AF9460)
-/* AF7E40 802404F0 AC201B10 */  sw        $zero, %lo(D_80241B10_AF9460)($at)
+/* AF7E3C 802404EC 3C018024 */  lui       $at, %hi(kkj_19_ItemChoice_HasSelectedItem)
+/* AF7E40 802404F0 AC201B10 */  sw        $zero, %lo(kkj_19_ItemChoice_HasSelectedItem)($at)
 .L802404F4:
-/* AF7E44 802404F4 3C038024 */  lui       $v1, %hi(D_80241B10_AF9460)
-/* AF7E48 802404F8 24631B10 */  addiu     $v1, $v1, %lo(D_80241B10_AF9460)
+/* AF7E44 802404F4 3C038024 */  lui       $v1, %hi(kkj_19_ItemChoice_HasSelectedItem)
+/* AF7E48 802404F8 24631B10 */  addiu     $v1, $v1, %lo(kkj_19_ItemChoice_HasSelectedItem)
 /* AF7E4C 802404FC 8C620000 */  lw        $v0, ($v1)
 /* AF7E50 80240500 54400003 */  bnel      $v0, $zero, .L80240510
 /* AF7E54 80240504 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802404DC_AF7E2C
 /* AF7E5C 8024050C 0000102D */   daddu    $v0, $zero, $zero
 .L80240510:
 /* AF7E60 80240510 8CC50000 */  lw        $a1, ($a2)
-/* AF7E64 80240514 3C068024 */  lui       $a2, %hi(D_80241B14_AF9464)
+/* AF7E64 80240514 3C068024 */  lui       $a2, %hi(kkj_19_ItemChoice_SelectedItemID)
 /* AF7E68 80240518 0C0B2026 */  jal       evt_set_variable
-/* AF7E6C 8024051C 8CC61B14 */   lw       $a2, %lo(D_80241B14_AF9464)($a2)
+/* AF7E6C 8024051C 8CC61B14 */   lw       $a2, %lo(kkj_19_ItemChoice_SelectedItemID)($a2)
 /* AF7E70 80240520 24020002 */  addiu     $v0, $zero, 2
 .L80240524:
 /* AF7E74 80240524 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s
index 70ecbb7e4b..b0d88515d9 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s
@@ -6,11 +6,11 @@ glabel func_8024226C_8B22DC
 /* 8B22E0 80242270 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8B22E4 80242274 10A00003 */  beqz      $a1, .L80242284
 /* 8B22E8 80242278 8C86000C */   lw       $a2, 0xc($a0)
-/* 8B22EC 8024227C 3C018024 */  lui       $at, %hi(D_80247E30_8B7EA0)
-/* 8B22F0 80242280 AC207E30 */  sw        $zero, %lo(D_80247E30_8B7EA0)($at)
+/* 8B22EC 8024227C 3C018024 */  lui       $at, %hi(kmr_02_ItemChoice_HasSelectedItem)
+/* 8B22F0 80242280 AC207E30 */  sw        $zero, %lo(kmr_02_ItemChoice_HasSelectedItem)($at)
 .L80242284:
-/* 8B22F4 80242284 3C038024 */  lui       $v1, %hi(D_80247E30_8B7EA0)
-/* 8B22F8 80242288 24637E30 */  addiu     $v1, $v1, %lo(D_80247E30_8B7EA0)
+/* 8B22F4 80242284 3C038024 */  lui       $v1, %hi(kmr_02_ItemChoice_HasSelectedItem)
+/* 8B22F8 80242288 24637E30 */  addiu     $v1, $v1, %lo(kmr_02_ItemChoice_HasSelectedItem)
 /* 8B22FC 8024228C 8C620000 */  lw        $v0, ($v1)
 /* 8B2300 80242290 54400003 */  bnel      $v0, $zero, .L802422A0
 /* 8B2304 80242294 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024226C_8B22DC
 /* 8B230C 8024229C 0000102D */   daddu    $v0, $zero, $zero
 .L802422A0:
 /* 8B2310 802422A0 8CC50000 */  lw        $a1, ($a2)
-/* 8B2314 802422A4 3C068024 */  lui       $a2, %hi(D_80247E34_8B7EA4)
+/* 8B2314 802422A4 3C068024 */  lui       $a2, %hi(kmr_02_ItemChoice_SelectedItemID)
 /* 8B2318 802422A8 0C0B2026 */  jal       evt_set_variable
-/* 8B231C 802422AC 8CC67E34 */   lw       $a2, %lo(D_80247E34_8B7EA4)($a2)
+/* 8B231C 802422AC 8CC67E34 */   lw       $a2, %lo(kmr_02_ItemChoice_SelectedItemID)($a2)
 /* 8B2320 802422B0 24020002 */  addiu     $v0, $zero, 2
 .L802422B4:
 /* 8B2324 802422B4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422C0_8B2330.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422C0_8B2330.s
deleted file mode 100644
index af01a994c4..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422C0_8B2330.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802422C0_8B2330
-/* 8B2330 802422C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8B2334 802422C4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8B2338 802422C8 8C82000C */  lw        $v0, 0xc($a0)
-/* 8B233C 802422CC 0C0B1EAF */  jal       evt_get_variable
-/* 8B2340 802422D0 8C450000 */   lw       $a1, ($v0)
-/* 8B2344 802422D4 3C018024 */  lui       $at, %hi(D_80247E34_8B7EA4)
-/* 8B2348 802422D8 AC227E34 */  sw        $v0, %lo(D_80247E34_8B7EA4)($at)
-/* 8B234C 802422DC 24020002 */  addiu     $v0, $zero, 2
-/* 8B2350 802422E0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8B2354 802422E4 24030001 */  addiu     $v1, $zero, 1
-/* 8B2358 802422E8 3C018024 */  lui       $at, %hi(D_80247E30_8B7EA0)
-/* 8B235C 802422EC AC237E30 */  sw        $v1, %lo(D_80247E30_8B7EA0)($at)
-/* 8B2360 802422F0 03E00008 */  jr        $ra
-/* 8B2364 802422F4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s
index 770ed08856..cc5676c22d 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s
@@ -6,11 +6,11 @@ glabel func_8024027C_A7873C
 /* A78740 80240280 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A78744 80240284 10A00003 */  beqz      $a1, .L80240294
 /* A78748 80240288 8C86000C */   lw       $a2, 0xc($a0)
-/* A7874C 8024028C 3C018024 */  lui       $at, %hi(D_80240D98_A79258)
-/* A78750 80240290 AC200D98 */  sw        $zero, %lo(D_80240D98_A79258)($at)
+/* A7874C 8024028C 3C018024 */  lui       $at, %hi(kpa_81_ItemChoice_HasSelectedItem)
+/* A78750 80240290 AC200D98 */  sw        $zero, %lo(kpa_81_ItemChoice_HasSelectedItem)($at)
 .L80240294:
-/* A78754 80240294 3C038024 */  lui       $v1, %hi(D_80240D98_A79258)
-/* A78758 80240298 24630D98 */  addiu     $v1, $v1, %lo(D_80240D98_A79258)
+/* A78754 80240294 3C038024 */  lui       $v1, %hi(kpa_81_ItemChoice_HasSelectedItem)
+/* A78758 80240298 24630D98 */  addiu     $v1, $v1, %lo(kpa_81_ItemChoice_HasSelectedItem)
 /* A7875C 8024029C 8C620000 */  lw        $v0, ($v1)
 /* A78760 802402A0 54400003 */  bnel      $v0, $zero, .L802402B0
 /* A78764 802402A4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024027C_A7873C
 /* A7876C 802402AC 0000102D */   daddu    $v0, $zero, $zero
 .L802402B0:
 /* A78770 802402B0 8CC50000 */  lw        $a1, ($a2)
-/* A78774 802402B4 3C068024 */  lui       $a2, %hi(D_80240D9C_A7925C)
+/* A78774 802402B4 3C068024 */  lui       $a2, %hi(kpa_81_ItemChoice_SelectedItemID)
 /* A78778 802402B8 0C0B2026 */  jal       evt_set_variable
-/* A7877C 802402BC 8CC60D9C */   lw       $a2, %lo(D_80240D9C_A7925C)($a2)
+/* A7877C 802402BC 8CC60D9C */   lw       $a2, %lo(kpa_81_ItemChoice_SelectedItemID)($a2)
 /* A78780 802402C0 24020002 */  addiu     $v0, $zero, 2
 .L802402C4:
 /* A78784 802402C4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s
deleted file mode 100644
index 60a8375722..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402D0_A78790
-/* A78790 802402D0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* A78794 802402D4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* A78798 802402D8 8C82000C */  lw        $v0, 0xc($a0)
-/* A7879C 802402DC 0C0B1EAF */  jal       evt_get_variable
-/* A787A0 802402E0 8C450000 */   lw       $a1, ($v0)
-/* A787A4 802402E4 3C018024 */  lui       $at, %hi(D_80240D9C_A7925C)
-/* A787A8 802402E8 AC220D9C */  sw        $v0, %lo(D_80240D9C_A7925C)($at)
-/* A787AC 802402EC 24020002 */  addiu     $v0, $zero, 2
-/* A787B0 802402F0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* A787B4 802402F4 24030001 */  addiu     $v1, $zero, 1
-/* A787B8 802402F8 3C018024 */  lui       $at, %hi(D_80240D98_A79258)
-/* A787BC 802402FC AC230D98 */  sw        $v1, %lo(D_80240D98_A79258)($at)
-/* A787C0 80240300 03E00008 */  jr        $ra
-/* A787C4 80240304 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s
index 4f84c65226..fafa51c1f3 100644
--- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s
+++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s
@@ -6,11 +6,11 @@ glabel func_8024027C_A7A77C
 /* A7A780 80240280 AFBF0010 */  sw        $ra, 0x10($sp)
 /* A7A784 80240284 10A00003 */  beqz      $a1, .L80240294
 /* A7A788 80240288 8C86000C */   lw       $a2, 0xc($a0)
-/* A7A78C 8024028C 3C018024 */  lui       $at, %hi(D_80240C20_A7B120)
-/* A7A790 80240290 AC200C20 */  sw        $zero, %lo(D_80240C20_A7B120)($at)
+/* A7A78C 8024028C 3C018024 */  lui       $at, %hi(kpa_82_ItemChoice_HasSelectedItem)
+/* A7A790 80240290 AC200C20 */  sw        $zero, %lo(kpa_82_ItemChoice_HasSelectedItem)($at)
 .L80240294:
-/* A7A794 80240294 3C038024 */  lui       $v1, %hi(D_80240C20_A7B120)
-/* A7A798 80240298 24630C20 */  addiu     $v1, $v1, %lo(D_80240C20_A7B120)
+/* A7A794 80240294 3C038024 */  lui       $v1, %hi(kpa_82_ItemChoice_HasSelectedItem)
+/* A7A798 80240298 24630C20 */  addiu     $v1, $v1, %lo(kpa_82_ItemChoice_HasSelectedItem)
 /* A7A79C 8024029C 8C620000 */  lw        $v0, ($v1)
 /* A7A7A0 802402A0 54400003 */  bnel      $v0, $zero, .L802402B0
 /* A7A7A4 802402A4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024027C_A7A77C
 /* A7A7AC 802402AC 0000102D */   daddu    $v0, $zero, $zero
 .L802402B0:
 /* A7A7B0 802402B0 8CC50000 */  lw        $a1, ($a2)
-/* A7A7B4 802402B4 3C068024 */  lui       $a2, %hi(D_80240C24_A7B124)
+/* A7A7B4 802402B4 3C068024 */  lui       $a2, %hi(kpa_82_ItemChoice_SelectedItemID)
 /* A7A7B8 802402B8 0C0B2026 */  jal       evt_set_variable
-/* A7A7BC 802402BC 8CC60C24 */   lw       $a2, %lo(D_80240C24_A7B124)($a2)
+/* A7A7BC 802402BC 8CC60C24 */   lw       $a2, %lo(kpa_82_ItemChoice_SelectedItemID)($a2)
 /* A7A7C0 802402C0 24020002 */  addiu     $v0, $zero, 2
 .L802402C4:
 /* A7A7C4 802402C4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s
index dea7590c1c..b5c8d54841 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s
@@ -6,11 +6,11 @@ glabel func_802418F0_7EC600
 /* 7EC604 802418F4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 7EC608 802418F8 10A00003 */  beqz      $a1, .L80241908
 /* 7EC60C 802418FC 8C86000C */   lw       $a2, 0xc($a0)
-/* 7EC610 80241900 3C018025 */  lui       $at, %hi(D_802483E8_7F30F8)
-/* 7EC614 80241904 AC2083E8 */  sw        $zero, %lo(D_802483E8_7F30F8)($at)
+/* 7EC610 80241900 3C018025 */  lui       $at, %hi(mac_00_ItemChoice_HasSelectedItem)
+/* 7EC614 80241904 AC2083E8 */  sw        $zero, %lo(mac_00_ItemChoice_HasSelectedItem)($at)
 .L80241908:
-/* 7EC618 80241908 3C038025 */  lui       $v1, %hi(D_802483E8_7F30F8)
-/* 7EC61C 8024190C 246383E8 */  addiu     $v1, $v1, %lo(D_802483E8_7F30F8)
+/* 7EC618 80241908 3C038025 */  lui       $v1, %hi(mac_00_ItemChoice_HasSelectedItem)
+/* 7EC61C 8024190C 246383E8 */  addiu     $v1, $v1, %lo(mac_00_ItemChoice_HasSelectedItem)
 /* 7EC620 80241910 8C620000 */  lw        $v0, ($v1)
 /* 7EC624 80241914 54400003 */  bnel      $v0, $zero, .L80241924
 /* 7EC628 80241918 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802418F0_7EC600
 /* 7EC630 80241920 0000102D */   daddu    $v0, $zero, $zero
 .L80241924:
 /* 7EC634 80241924 8CC50000 */  lw        $a1, ($a2)
-/* 7EC638 80241928 3C068025 */  lui       $a2, %hi(D_802483EC_7F30FC)
+/* 7EC638 80241928 3C068025 */  lui       $a2, %hi(mac_00_ItemChoice_SelectedItemID)
 /* 7EC63C 8024192C 0C0B2026 */  jal       evt_set_variable
-/* 7EC640 80241930 8CC683EC */   lw       $a2, %lo(D_802483EC_7F30FC)($a2)
+/* 7EC640 80241930 8CC683EC */   lw       $a2, %lo(mac_00_ItemChoice_SelectedItemID)($a2)
 /* 7EC644 80241934 24020002 */  addiu     $v0, $zero, 2
 .L80241938:
 /* 7EC648 80241938 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s
deleted file mode 100644
index c0ecdde431..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241944_7EC654
-/* 7EC654 80241944 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EC658 80241948 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7EC65C 8024194C 8C82000C */  lw        $v0, 0xc($a0)
-/* 7EC660 80241950 0C0B1EAF */  jal       evt_get_variable
-/* 7EC664 80241954 8C450000 */   lw       $a1, ($v0)
-/* 7EC668 80241958 3C018025 */  lui       $at, %hi(D_802483EC_7F30FC)
-/* 7EC66C 8024195C AC2283EC */  sw        $v0, %lo(D_802483EC_7F30FC)($at)
-/* 7EC670 80241960 24020002 */  addiu     $v0, $zero, 2
-/* 7EC674 80241964 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7EC678 80241968 24030001 */  addiu     $v1, $zero, 1
-/* 7EC67C 8024196C 3C018025 */  lui       $at, %hi(D_802483E8_7F30F8)
-/* 7EC680 80241970 AC2383E8 */  sw        $v1, %lo(D_802483E8_7F30F8)($at)
-/* 7EC684 80241974 03E00008 */  jr        $ra
-/* 7EC688 80241978 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s
index 431c0ff230..a3ea76a9f5 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s
@@ -6,11 +6,11 @@ glabel func_80243744_7EE454
 /* 7EE458 80243748 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 7EE45C 8024374C 10A00003 */  beqz      $a1, .L8024375C
 /* 7EE460 80243750 8C86000C */   lw       $a2, 0xc($a0)
-/* 7EE464 80243754 3C018025 */  lui       $at, %hi(D_8024ED4C_7F9A5C)
-/* 7EE468 80243758 AC20ED4C */  sw        $zero, %lo(D_8024ED4C_7F9A5C)($at)
+/* 7EE464 80243754 3C018025 */  lui       $at, %hi(dup_mac_00_ItemChoice_HasSelectedItem)
+/* 7EE468 80243758 AC20ED4C */  sw        $zero, %lo(dup_mac_00_ItemChoice_HasSelectedItem)($at)
 .L8024375C:
-/* 7EE46C 8024375C 3C038025 */  lui       $v1, %hi(D_8024ED4C_7F9A5C)
-/* 7EE470 80243760 2463ED4C */  addiu     $v1, $v1, %lo(D_8024ED4C_7F9A5C)
+/* 7EE46C 8024375C 3C038025 */  lui       $v1, %hi(dup_mac_00_ItemChoice_HasSelectedItem)
+/* 7EE470 80243760 2463ED4C */  addiu     $v1, $v1, %lo(dup_mac_00_ItemChoice_HasSelectedItem)
 /* 7EE474 80243764 8C620000 */  lw        $v0, ($v1)
 /* 7EE478 80243768 54400003 */  bnel      $v0, $zero, .L80243778
 /* 7EE47C 8024376C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80243744_7EE454
 /* 7EE484 80243774 0000102D */   daddu    $v0, $zero, $zero
 .L80243778:
 /* 7EE488 80243778 8CC50000 */  lw        $a1, ($a2)
-/* 7EE48C 8024377C 3C068025 */  lui       $a2, %hi(D_8024ED50_7F9A60)
+/* 7EE48C 8024377C 3C068025 */  lui       $a2, %hi(dup_mac_00_ItemChoice_SelectedItemID)
 /* 7EE490 80243780 0C0B2026 */  jal       evt_set_variable
-/* 7EE494 80243784 8CC6ED50 */   lw       $a2, %lo(D_8024ED50_7F9A60)($a2)
+/* 7EE494 80243784 8CC6ED50 */   lw       $a2, %lo(dup_mac_00_ItemChoice_SelectedItemID)($a2)
 /* 7EE498 80243788 24020002 */  addiu     $v0, $zero, 2
 .L8024378C:
 /* 7EE49C 8024378C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s
deleted file mode 100644
index 2b09a931fb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243798_7EE4A8
-/* 7EE4A8 80243798 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 7EE4AC 8024379C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 7EE4B0 802437A0 8C82000C */  lw        $v0, 0xc($a0)
-/* 7EE4B4 802437A4 0C0B1EAF */  jal       evt_get_variable
-/* 7EE4B8 802437A8 8C450000 */   lw       $a1, ($v0)
-/* 7EE4BC 802437AC 3C018025 */  lui       $at, %hi(D_8024ED50_7F9A60)
-/* 7EE4C0 802437B0 AC22ED50 */  sw        $v0, %lo(D_8024ED50_7F9A60)($at)
-/* 7EE4C4 802437B4 24020002 */  addiu     $v0, $zero, 2
-/* 7EE4C8 802437B8 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 7EE4CC 802437BC 24030001 */  addiu     $v1, $zero, 1
-/* 7EE4D0 802437C0 3C018025 */  lui       $at, %hi(D_8024ED4C_7F9A5C)
-/* 7EE4D4 802437C4 AC23ED4C */  sw        $v1, %lo(D_8024ED4C_7F9A5C)($at)
-/* 7EE4D8 802437C8 03E00008 */  jr        $ra
-/* 7EE4DC 802437CC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s
index 9d4ee5bbff..fd8d12cd68 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s
@@ -6,11 +6,11 @@ glabel func_80243CD4_804554
 /* 804558 80243CD8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 80455C 80243CDC 10A00003 */  beqz      $a1, .L80243CEC
 /* 804560 80243CE0 8C86000C */   lw       $a2, 0xc($a0)
-/* 804564 80243CE4 3C018025 */  lui       $at, %hi(D_8024D944_80E1C4)
-/* 804568 80243CE8 AC20D944 */  sw        $zero, %lo(D_8024D944_80E1C4)($at)
+/* 804564 80243CE4 3C018025 */  lui       $at, %hi(mac_01_ItemChoice_HasSelectedItem)
+/* 804568 80243CE8 AC20D944 */  sw        $zero, %lo(mac_01_ItemChoice_HasSelectedItem)($at)
 .L80243CEC:
-/* 80456C 80243CEC 3C038025 */  lui       $v1, %hi(D_8024D944_80E1C4)
-/* 804570 80243CF0 2463D944 */  addiu     $v1, $v1, %lo(D_8024D944_80E1C4)
+/* 80456C 80243CEC 3C038025 */  lui       $v1, %hi(mac_01_ItemChoice_HasSelectedItem)
+/* 804570 80243CF0 2463D944 */  addiu     $v1, $v1, %lo(mac_01_ItemChoice_HasSelectedItem)
 /* 804574 80243CF4 8C620000 */  lw        $v0, ($v1)
 /* 804578 80243CF8 54400003 */  bnel      $v0, $zero, .L80243D08
 /* 80457C 80243CFC AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80243CD4_804554
 /* 804584 80243D04 0000102D */   daddu    $v0, $zero, $zero
 .L80243D08:
 /* 804588 80243D08 8CC50000 */  lw        $a1, ($a2)
-/* 80458C 80243D0C 3C068025 */  lui       $a2, %hi(D_8024D948_80E1C8)
+/* 80458C 80243D0C 3C068025 */  lui       $a2, %hi(mac_01_ItemChoice_SelectedItemID)
 /* 804590 80243D10 0C0B2026 */  jal       evt_set_variable
-/* 804594 80243D14 8CC6D948 */   lw       $a2, %lo(D_8024D948_80E1C8)($a2)
+/* 804594 80243D14 8CC6D948 */   lw       $a2, %lo(mac_01_ItemChoice_SelectedItemID)($a2)
 /* 804598 80243D18 24020002 */  addiu     $v0, $zero, 2
 .L80243D1C:
 /* 80459C 80243D1C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s
index ed8df429e0..ae5fa914ba 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s
@@ -6,11 +6,11 @@ glabel func_80242A80_825D40
 /* 825D44 80242A84 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 825D48 80242A88 10A00003 */  beqz      $a1, .L80242A98
 /* 825D4C 80242A8C 8C86000C */   lw       $a2, 0xc($a0)
-/* 825D50 80242A90 3C018025 */  lui       $at, %hi(D_80248778_82BA38)
-/* 825D54 80242A94 AC208778 */  sw        $zero, %lo(D_80248778_82BA38)($at)
+/* 825D50 80242A90 3C018025 */  lui       $at, %hi(mac_02_ItemChoice_HasSelectedItem)
+/* 825D54 80242A94 AC208778 */  sw        $zero, %lo(mac_02_ItemChoice_HasSelectedItem)($at)
 .L80242A98:
-/* 825D58 80242A98 3C038025 */  lui       $v1, %hi(D_80248778_82BA38)
-/* 825D5C 80242A9C 24638778 */  addiu     $v1, $v1, %lo(D_80248778_82BA38)
+/* 825D58 80242A98 3C038025 */  lui       $v1, %hi(mac_02_ItemChoice_HasSelectedItem)
+/* 825D5C 80242A9C 24638778 */  addiu     $v1, $v1, %lo(mac_02_ItemChoice_HasSelectedItem)
 /* 825D60 80242AA0 8C620000 */  lw        $v0, ($v1)
 /* 825D64 80242AA4 54400003 */  bnel      $v0, $zero, .L80242AB4
 /* 825D68 80242AA8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242A80_825D40
 /* 825D70 80242AB0 0000102D */   daddu    $v0, $zero, $zero
 .L80242AB4:
 /* 825D74 80242AB4 8CC50000 */  lw        $a1, ($a2)
-/* 825D78 80242AB8 3C068025 */  lui       $a2, %hi(D_8024877C_82BA3C)
+/* 825D78 80242AB8 3C068025 */  lui       $a2, %hi(mac_02_ItemChoice_SelectedItemID)
 /* 825D7C 80242ABC 0C0B2026 */  jal       evt_set_variable
-/* 825D80 80242AC0 8CC6877C */   lw       $a2, %lo(D_8024877C_82BA3C)($a2)
+/* 825D80 80242AC0 8CC6877C */   lw       $a2, %lo(mac_02_ItemChoice_SelectedItemID)($a2)
 /* 825D84 80242AC4 24020002 */  addiu     $v0, $zero, 2
 .L80242AC8:
 /* 825D88 80242AC8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s
deleted file mode 100644
index 26d37f5dc1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242AD4_825D94
-/* 825D94 80242AD4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 825D98 80242AD8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 825D9C 80242ADC 8C82000C */  lw        $v0, 0xc($a0)
-/* 825DA0 80242AE0 0C0B1EAF */  jal       evt_get_variable
-/* 825DA4 80242AE4 8C450000 */   lw       $a1, ($v0)
-/* 825DA8 80242AE8 3C018025 */  lui       $at, %hi(D_8024877C_82BA3C)
-/* 825DAC 80242AEC AC22877C */  sw        $v0, %lo(D_8024877C_82BA3C)($at)
-/* 825DB0 80242AF0 24020002 */  addiu     $v0, $zero, 2
-/* 825DB4 80242AF4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 825DB8 80242AF8 24030001 */  addiu     $v1, $zero, 1
-/* 825DBC 80242AFC 3C018025 */  lui       $at, %hi(D_80248778_82BA38)
-/* 825DC0 80242B00 AC238778 */  sw        $v1, %lo(D_80248778_82BA38)($at)
-/* 825DC4 80242B04 03E00008 */  jr        $ra
-/* 825DC8 80242B08 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s
index f49c7d13a9..1db87fe61e 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s
@@ -6,11 +6,11 @@ glabel func_80241770_832F70
 /* 832F74 80241774 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 832F78 80241778 10A00003 */  beqz      $a1, .L80241788
 /* 832F7C 8024177C 8C86000C */   lw       $a2, 0xc($a0)
-/* 832F80 80241780 3C018025 */  lui       $at, %hi(D_80248C6C_83A46C)
-/* 832F84 80241784 AC208C6C */  sw        $zero, %lo(D_80248C6C_83A46C)($at)
+/* 832F80 80241780 3C018025 */  lui       $at, %hi(mac_03_ItemChoice_HasSelectedItem)
+/* 832F84 80241784 AC208C6C */  sw        $zero, %lo(mac_03_ItemChoice_HasSelectedItem)($at)
 .L80241788:
-/* 832F88 80241788 3C038025 */  lui       $v1, %hi(D_80248C6C_83A46C)
-/* 832F8C 8024178C 24638C6C */  addiu     $v1, $v1, %lo(D_80248C6C_83A46C)
+/* 832F88 80241788 3C038025 */  lui       $v1, %hi(mac_03_ItemChoice_HasSelectedItem)
+/* 832F8C 8024178C 24638C6C */  addiu     $v1, $v1, %lo(mac_03_ItemChoice_HasSelectedItem)
 /* 832F90 80241790 8C620000 */  lw        $v0, ($v1)
 /* 832F94 80241794 54400003 */  bnel      $v0, $zero, .L802417A4
 /* 832F98 80241798 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241770_832F70
 /* 832FA0 802417A0 0000102D */   daddu    $v0, $zero, $zero
 .L802417A4:
 /* 832FA4 802417A4 8CC50000 */  lw        $a1, ($a2)
-/* 832FA8 802417A8 3C068025 */  lui       $a2, %hi(D_80248C70_83A470)
+/* 832FA8 802417A8 3C068025 */  lui       $a2, %hi(mac_03_ItemChoice_SelectedItemID)
 /* 832FAC 802417AC 0C0B2026 */  jal       evt_set_variable
-/* 832FB0 802417B0 8CC68C70 */   lw       $a2, %lo(D_80248C70_83A470)($a2)
+/* 832FB0 802417B0 8CC68C70 */   lw       $a2, %lo(mac_03_ItemChoice_SelectedItemID)($a2)
 /* 832FB4 802417B4 24020002 */  addiu     $v0, $zero, 2
 .L802417B8:
 /* 832FB8 802417B8 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s
deleted file mode 100644
index 7ec0c1c1aa..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802417C4_832FC4
-/* 832FC4 802417C4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 832FC8 802417C8 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 832FCC 802417CC 8C82000C */  lw        $v0, 0xc($a0)
-/* 832FD0 802417D0 0C0B1EAF */  jal       evt_get_variable
-/* 832FD4 802417D4 8C450000 */   lw       $a1, ($v0)
-/* 832FD8 802417D8 3C018025 */  lui       $at, %hi(D_80248C70_83A470)
-/* 832FDC 802417DC AC228C70 */  sw        $v0, %lo(D_80248C70_83A470)($at)
-/* 832FE0 802417E0 24020002 */  addiu     $v0, $zero, 2
-/* 832FE4 802417E4 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 832FE8 802417E8 24030001 */  addiu     $v1, $zero, 1
-/* 832FEC 802417EC 3C018025 */  lui       $at, %hi(D_80248C6C_83A46C)
-/* 832FF0 802417F0 AC238C6C */  sw        $v1, %lo(D_80248C6C_83A46C)($at)
-/* 832FF4 802417F4 03E00008 */  jr        $ra
-/* 832FF8 802417F8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s
index 14d6fe6792..54eaa4634c 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241720_8442F0.s
@@ -6,11 +6,11 @@ glabel func_80241720_8442F0
 /* 8442F4 80241724 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 8442F8 80241728 10A00003 */  beqz      $a1, .L80241738
 /* 8442FC 8024172C 8C86000C */   lw       $a2, 0xc($a0)
-/* 844300 80241730 3C018024 */  lui       $at, %hi(D_80246610_8491E0)
-/* 844304 80241734 AC206610 */  sw        $zero, %lo(D_80246610_8491E0)($at)
+/* 844300 80241730 3C018024 */  lui       $at, %hi(mac_04_ItemChoice_HasSelectedItem)
+/* 844304 80241734 AC206610 */  sw        $zero, %lo(mac_04_ItemChoice_HasSelectedItem)($at)
 .L80241738:
-/* 844308 80241738 3C038024 */  lui       $v1, %hi(D_80246610_8491E0)
-/* 84430C 8024173C 24636610 */  addiu     $v1, $v1, %lo(D_80246610_8491E0)
+/* 844308 80241738 3C038024 */  lui       $v1, %hi(mac_04_ItemChoice_HasSelectedItem)
+/* 84430C 8024173C 24636610 */  addiu     $v1, $v1, %lo(mac_04_ItemChoice_HasSelectedItem)
 /* 844310 80241740 8C620000 */  lw        $v0, ($v1)
 /* 844314 80241744 54400003 */  bnel      $v0, $zero, .L80241754
 /* 844318 80241748 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241720_8442F0
 /* 844320 80241750 0000102D */   daddu    $v0, $zero, $zero
 .L80241754:
 /* 844324 80241754 8CC50000 */  lw        $a1, ($a2)
-/* 844328 80241758 3C068024 */  lui       $a2, %hi(D_80246614_8491E4)
+/* 844328 80241758 3C068024 */  lui       $a2, %hi(mac_04_ItemChoice_SelectedItemID)
 /* 84432C 8024175C 0C0B2026 */  jal       evt_set_variable
-/* 844330 80241760 8CC66614 */   lw       $a2, %lo(D_80246614_8491E4)($a2)
+/* 844330 80241760 8CC66614 */   lw       $a2, %lo(mac_04_ItemChoice_SelectedItemID)($a2)
 /* 844334 80241764 24020002 */  addiu     $v0, $zero, 2
 .L80241768:
 /* 844338 80241768 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s b/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s
deleted file mode 100644
index d1b9c34f48..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241774_844344
-/* 844344 80241774 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 844348 80241778 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 84434C 8024177C 8C82000C */  lw        $v0, 0xc($a0)
-/* 844350 80241780 0C0B1EAF */  jal       evt_get_variable
-/* 844354 80241784 8C450000 */   lw       $a1, ($v0)
-/* 844358 80241788 3C018024 */  lui       $at, %hi(D_80246614_8491E4)
-/* 84435C 8024178C AC226614 */  sw        $v0, %lo(D_80246614_8491E4)($at)
-/* 844360 80241790 24020002 */  addiu     $v0, $zero, 2
-/* 844364 80241794 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 844368 80241798 24030001 */  addiu     $v1, $zero, 1
-/* 84436C 8024179C 3C018024 */  lui       $at, %hi(D_80246610_8491E0)
-/* 844370 802417A0 AC236610 */  sw        $v1, %lo(D_80246610_8491E0)($at)
-/* 844374 802417A4 03E00008 */  jr        $ra
-/* 844378 802417A8 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s
index 4f4b4ccf22..0ae1e650d8 100644
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s
+++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s
@@ -6,11 +6,11 @@ glabel func_802425E0_854750
 /* 854754 802425E4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 854758 802425E8 10A00003 */  beqz      $a1, .L802425F8
 /* 85475C 802425EC 8C86000C */   lw       $a2, 0xc($a0)
-/* 854760 802425F0 3C018024 */  lui       $at, %hi(D_802476D8_859848)
-/* 854764 802425F4 AC2076D8 */  sw        $zero, %lo(D_802476D8_859848)($at)
+/* 854760 802425F0 3C018024 */  lui       $at, %hi(mac_05_ItemChoice_HasSelectedItem)
+/* 854764 802425F4 AC2076D8 */  sw        $zero, %lo(mac_05_ItemChoice_HasSelectedItem)($at)
 .L802425F8:
-/* 854768 802425F8 3C038024 */  lui       $v1, %hi(D_802476D8_859848)
-/* 85476C 802425FC 246376D8 */  addiu     $v1, $v1, %lo(D_802476D8_859848)
+/* 854768 802425F8 3C038024 */  lui       $v1, %hi(mac_05_ItemChoice_HasSelectedItem)
+/* 85476C 802425FC 246376D8 */  addiu     $v1, $v1, %lo(mac_05_ItemChoice_HasSelectedItem)
 /* 854770 80242600 8C620000 */  lw        $v0, ($v1)
 /* 854774 80242604 54400003 */  bnel      $v0, $zero, .L80242614
 /* 854778 80242608 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802425E0_854750
 /* 854780 80242610 0000102D */   daddu    $v0, $zero, $zero
 .L80242614:
 /* 854784 80242614 8CC50000 */  lw        $a1, ($a2)
-/* 854788 80242618 3C068024 */  lui       $a2, %hi(D_802476DC_85984C)
+/* 854788 80242618 3C068024 */  lui       $a2, %hi(mac_05_ItemChoice_SelectedItemID)
 /* 85478C 8024261C 0C0B2026 */  jal       evt_set_variable
-/* 854790 80242620 8CC676DC */   lw       $a2, %lo(D_802476DC_85984C)($a2)
+/* 854790 80242620 8CC676DC */   lw       $a2, %lo(mac_05_ItemChoice_SelectedItemID)($a2)
 /* 854794 80242624 24020002 */  addiu     $v0, $zero, 2
 .L80242628:
 /* 854798 80242628 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s
deleted file mode 100644
index 23a6b66b08..0000000000
--- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242634_8547A4
-/* 8547A4 80242634 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 8547A8 80242638 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 8547AC 8024263C 8C82000C */  lw        $v0, 0xc($a0)
-/* 8547B0 80242640 0C0B1EAF */  jal       evt_get_variable
-/* 8547B4 80242644 8C450000 */   lw       $a1, ($v0)
-/* 8547B8 80242648 3C018024 */  lui       $at, %hi(D_802476DC_85984C)
-/* 8547BC 8024264C AC2276DC */  sw        $v0, %lo(D_802476DC_85984C)($at)
-/* 8547C0 80242650 24020002 */  addiu     $v0, $zero, 2
-/* 8547C4 80242654 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 8547C8 80242658 24030001 */  addiu     $v1, $zero, 1
-/* 8547CC 8024265C 3C018024 */  lui       $at, %hi(D_802476D8_859848)
-/* 8547D0 80242660 AC2376D8 */  sw        $v1, %lo(D_802476D8_859848)($at)
-/* 8547D4 80242664 03E00008 */  jr        $ra
-/* 8547D8 80242668 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s
index c824281999..ae3dc5fb14 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s
@@ -6,11 +6,11 @@ glabel func_80242028_9C7408
 /* 9C740C 8024202C AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9C7410 80242030 10A00003 */  beqz      $a1, .L80242040
 /* 9C7414 80242034 8C86000C */   lw       $a2, 0xc($a0)
-/* 9C7418 80242038 3C018025 */  lui       $at, %hi(D_8024856C_9CD94C)
-/* 9C741C 8024203C AC20856C */  sw        $zero, %lo(D_8024856C_9CD94C)($at)
+/* 9C7418 80242038 3C018025 */  lui       $at, %hi(nok_01_ItemChoice_HasSelectedItem)
+/* 9C741C 8024203C AC20856C */  sw        $zero, %lo(nok_01_ItemChoice_HasSelectedItem)($at)
 .L80242040:
-/* 9C7420 80242040 3C038025 */  lui       $v1, %hi(D_8024856C_9CD94C)
-/* 9C7424 80242044 2463856C */  addiu     $v1, $v1, %lo(D_8024856C_9CD94C)
+/* 9C7420 80242040 3C038025 */  lui       $v1, %hi(nok_01_ItemChoice_HasSelectedItem)
+/* 9C7424 80242044 2463856C */  addiu     $v1, $v1, %lo(nok_01_ItemChoice_HasSelectedItem)
 /* 9C7428 80242048 8C620000 */  lw        $v0, ($v1)
 /* 9C742C 8024204C 54400003 */  bnel      $v0, $zero, .L8024205C
 /* 9C7430 80242050 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242028_9C7408
 /* 9C7438 80242058 0000102D */   daddu    $v0, $zero, $zero
 .L8024205C:
 /* 9C743C 8024205C 8CC50000 */  lw        $a1, ($a2)
-/* 9C7440 80242060 3C068025 */  lui       $a2, %hi(D_80248570_9CD950)
+/* 9C7440 80242060 3C068025 */  lui       $a2, %hi(nok_01_ItemChoice_SelectedItemID)
 /* 9C7444 80242064 0C0B2026 */  jal       evt_set_variable
-/* 9C7448 80242068 8CC68570 */   lw       $a2, %lo(D_80248570_9CD950)($a2)
+/* 9C7448 80242068 8CC68570 */   lw       $a2, %lo(nok_01_ItemChoice_SelectedItemID)($a2)
 /* 9C744C 8024206C 24020002 */  addiu     $v0, $zero, 2
 .L80242070:
 /* 9C7450 80242070 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s
deleted file mode 100644
index 4ed96ccc40..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024207C_9C745C
-/* 9C745C 8024207C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9C7460 80242080 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9C7464 80242084 8C82000C */  lw        $v0, 0xc($a0)
-/* 9C7468 80242088 0C0B1EAF */  jal       evt_get_variable
-/* 9C746C 8024208C 8C450000 */   lw       $a1, ($v0)
-/* 9C7470 80242090 3C018025 */  lui       $at, %hi(D_80248570_9CD950)
-/* 9C7474 80242094 AC228570 */  sw        $v0, %lo(D_80248570_9CD950)($at)
-/* 9C7478 80242098 24020002 */  addiu     $v0, $zero, 2
-/* 9C747C 8024209C 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9C7480 802420A0 24030001 */  addiu     $v1, $zero, 1
-/* 9C7484 802420A4 3C018025 */  lui       $at, %hi(D_8024856C_9CD94C)
-/* 9C7488 802420A8 AC23856C */  sw        $v1, %lo(D_8024856C_9CD94C)($at)
-/* 9C748C 802420AC 03E00008 */  jr        $ra
-/* 9C7490 802420B0 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s
index 52d7ef2bfa..da03d518de 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s
@@ -6,11 +6,11 @@ glabel func_80240624_9D7644
 /* 9D7648 80240628 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9D764C 8024062C 10A00003 */  beqz      $a1, .L8024063C
 /* 9D7650 80240630 8C86000C */   lw       $a2, 0xc($a0)
-/* 9D7654 80240634 3C018024 */  lui       $at, %hi(D_80245434_9DC454)
-/* 9D7658 80240638 AC205434 */  sw        $zero, %lo(D_80245434_9DC454)($at)
+/* 9D7654 80240634 3C018024 */  lui       $at, %hi(nok_02_ItemChoice_HasSelectedItem)
+/* 9D7658 80240638 AC205434 */  sw        $zero, %lo(nok_02_ItemChoice_HasSelectedItem)($at)
 .L8024063C:
-/* 9D765C 8024063C 3C038024 */  lui       $v1, %hi(D_80245434_9DC454)
-/* 9D7660 80240640 24635434 */  addiu     $v1, $v1, %lo(D_80245434_9DC454)
+/* 9D765C 8024063C 3C038024 */  lui       $v1, %hi(nok_02_ItemChoice_HasSelectedItem)
+/* 9D7660 80240640 24635434 */  addiu     $v1, $v1, %lo(nok_02_ItemChoice_HasSelectedItem)
 /* 9D7664 80240644 8C620000 */  lw        $v0, ($v1)
 /* 9D7668 80240648 54400003 */  bnel      $v0, $zero, .L80240658
 /* 9D766C 8024064C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240624_9D7644
 /* 9D7674 80240654 0000102D */   daddu    $v0, $zero, $zero
 .L80240658:
 /* 9D7678 80240658 8CC50000 */  lw        $a1, ($a2)
-/* 9D767C 8024065C 3C068024 */  lui       $a2, %hi(D_80245438_9DC458)
+/* 9D767C 8024065C 3C068024 */  lui       $a2, %hi(nok_02_ItemChoice_SelectedItemID)
 /* 9D7680 80240660 0C0B2026 */  jal       evt_set_variable
-/* 9D7684 80240664 8CC65438 */   lw       $a2, %lo(D_80245438_9DC458)($a2)
+/* 9D7684 80240664 8CC65438 */   lw       $a2, %lo(nok_02_ItemChoice_SelectedItemID)($a2)
 /* 9D7688 80240668 24020002 */  addiu     $v0, $zero, 2
 .L8024066C:
 /* 9D768C 8024066C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s
deleted file mode 100644
index c7c4543bb1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240678_9D7698
-/* 9D7698 80240678 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D769C 8024067C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9D76A0 80240680 8C82000C */  lw        $v0, 0xc($a0)
-/* 9D76A4 80240684 0C0B1EAF */  jal       evt_get_variable
-/* 9D76A8 80240688 8C450000 */   lw       $a1, ($v0)
-/* 9D76AC 8024068C 3C018024 */  lui       $at, %hi(D_80245438_9DC458)
-/* 9D76B0 80240690 AC225438 */  sw        $v0, %lo(D_80245438_9DC458)($at)
-/* 9D76B4 80240694 24020002 */  addiu     $v0, $zero, 2
-/* 9D76B8 80240698 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9D76BC 8024069C 24030001 */  addiu     $v1, $zero, 1
-/* 9D76C0 802406A0 3C018024 */  lui       $at, %hi(D_80245434_9DC454)
-/* 9D76C4 802406A4 AC235434 */  sw        $v1, %lo(D_80245434_9DC454)($at)
-/* 9D76C8 802406A8 03E00008 */  jr        $ra
-/* 9D76CC 802406AC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s
index ff41373210..1cb6f3e72f 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s
@@ -6,11 +6,11 @@ glabel func_80242BD0_9D9BF0
 /* 9D9BF4 80242BD4 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9D9BF8 80242BD8 10A00003 */  beqz      $a1, .L80242BE8
 /* 9D9BFC 80242BDC 8C86000C */   lw       $a2, 0xc($a0)
-/* 9D9C00 80242BE0 3C018025 */  lui       $at, %hi(D_802496F0_9E0710)
-/* 9D9C04 80242BE4 AC2096F0 */  sw        $zero, %lo(D_802496F0_9E0710)($at)
+/* 9D9C00 80242BE0 3C018025 */  lui       $at, %hi(dup_nok_02_ItemChoice_HasSelectedItem)
+/* 9D9C04 80242BE4 AC2096F0 */  sw        $zero, %lo(dup_nok_02_ItemChoice_HasSelectedItem)($at)
 .L80242BE8:
-/* 9D9C08 80242BE8 3C038025 */  lui       $v1, %hi(D_802496F0_9E0710)
-/* 9D9C0C 80242BEC 246396F0 */  addiu     $v1, $v1, %lo(D_802496F0_9E0710)
+/* 9D9C08 80242BE8 3C038025 */  lui       $v1, %hi(dup_nok_02_ItemChoice_HasSelectedItem)
+/* 9D9C0C 80242BEC 246396F0 */  addiu     $v1, $v1, %lo(dup_nok_02_ItemChoice_HasSelectedItem)
 /* 9D9C10 80242BF0 8C620000 */  lw        $v0, ($v1)
 /* 9D9C14 80242BF4 54400003 */  bnel      $v0, $zero, .L80242C04
 /* 9D9C18 80242BF8 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242BD0_9D9BF0
 /* 9D9C20 80242C00 0000102D */   daddu    $v0, $zero, $zero
 .L80242C04:
 /* 9D9C24 80242C04 8CC50000 */  lw        $a1, ($a2)
-/* 9D9C28 80242C08 3C068025 */  lui       $a2, %hi(D_802496F4_9E0714)
+/* 9D9C28 80242C08 3C068025 */  lui       $a2, %hi(dup_nok_02_ItemChoice_SelectedItemID)
 /* 9D9C2C 80242C0C 0C0B2026 */  jal       evt_set_variable
-/* 9D9C30 80242C10 8CC696F4 */   lw       $a2, %lo(D_802496F4_9E0714)($a2)
+/* 9D9C30 80242C10 8CC696F4 */   lw       $a2, %lo(dup_nok_02_ItemChoice_SelectedItemID)($a2)
 /* 9D9C34 80242C14 24020002 */  addiu     $v0, $zero, 2
 .L80242C18:
 /* 9D9C38 80242C18 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s
deleted file mode 100644
index 31996dce06..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242C24_9D9C44
-/* 9D9C44 80242C24 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9D9C48 80242C28 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9D9C4C 80242C2C 8C82000C */  lw        $v0, 0xc($a0)
-/* 9D9C50 80242C30 0C0B1EAF */  jal       evt_get_variable
-/* 9D9C54 80242C34 8C450000 */   lw       $a1, ($v0)
-/* 9D9C58 80242C38 3C018025 */  lui       $at, %hi(D_802496F4_9E0714)
-/* 9D9C5C 80242C3C AC2296F4 */  sw        $v0, %lo(D_802496F4_9E0714)($at)
-/* 9D9C60 80242C40 24020002 */  addiu     $v0, $zero, 2
-/* 9D9C64 80242C44 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9D9C68 80242C48 24030001 */  addiu     $v1, $zero, 1
-/* 9D9C6C 80242C4C 3C018025 */  lui       $at, %hi(D_802496F0_9E0710)
-/* 9D9C70 80242C50 AC2396F0 */  sw        $v1, %lo(D_802496F0_9E0710)($at)
-/* 9D9C74 80242C54 03E00008 */  jr        $ra
-/* 9D9C78 80242C58 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s
index 0595bedc7e..d71e100ce7 100644
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s
+++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s
@@ -6,11 +6,11 @@ glabel func_80243BEC_9DAC0C
 /* 9DAC10 80243BF0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* 9DAC14 80243BF4 10A00003 */  beqz      $a1, .L80243C04
 /* 9DAC18 80243BF8 8C86000C */   lw       $a2, 0xc($a0)
-/* 9DAC1C 80243BFC 3C018025 */  lui       $at, %hi(D_80252400_9E9420)
-/* 9DAC20 80243C00 AC202400 */  sw        $zero, %lo(D_80252400_9E9420)($at)
+/* 9DAC1C 80243BFC 3C018025 */  lui       $at, %hi(dup2_nok_02_ItemChoice_HasSelectedItem)
+/* 9DAC20 80243C00 AC202400 */  sw        $zero, %lo(dup2_nok_02_ItemChoice_HasSelectedItem)($at)
 .L80243C04:
-/* 9DAC24 80243C04 3C038025 */  lui       $v1, %hi(D_80252400_9E9420)
-/* 9DAC28 80243C08 24632400 */  addiu     $v1, $v1, %lo(D_80252400_9E9420)
+/* 9DAC24 80243C04 3C038025 */  lui       $v1, %hi(dup2_nok_02_ItemChoice_HasSelectedItem)
+/* 9DAC28 80243C08 24632400 */  addiu     $v1, $v1, %lo(dup2_nok_02_ItemChoice_HasSelectedItem)
 /* 9DAC2C 80243C0C 8C620000 */  lw        $v0, ($v1)
 /* 9DAC30 80243C10 54400003 */  bnel      $v0, $zero, .L80243C20
 /* 9DAC34 80243C14 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80243BEC_9DAC0C
 /* 9DAC3C 80243C1C 0000102D */   daddu    $v0, $zero, $zero
 .L80243C20:
 /* 9DAC40 80243C20 8CC50000 */  lw        $a1, ($a2)
-/* 9DAC44 80243C24 3C068025 */  lui       $a2, %hi(D_80252404_9E9424)
+/* 9DAC44 80243C24 3C068025 */  lui       $a2, %hi(dup2_nok_02_ItemChoice_SelectedItemID)
 /* 9DAC48 80243C28 0C0B2026 */  jal       evt_set_variable
-/* 9DAC4C 80243C2C 8CC62404 */   lw       $a2, %lo(D_80252404_9E9424)($a2)
+/* 9DAC4C 80243C2C 8CC62404 */   lw       $a2, %lo(dup2_nok_02_ItemChoice_SelectedItemID)($a2)
 /* 9DAC50 80243C30 24020002 */  addiu     $v0, $zero, 2
 .L80243C34:
 /* 9DAC54 80243C34 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s
deleted file mode 100644
index 00fa3a99c3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243C40_9DAC60
-/* 9DAC60 80243C40 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 9DAC64 80243C44 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 9DAC68 80243C48 8C82000C */  lw        $v0, 0xc($a0)
-/* 9DAC6C 80243C4C 0C0B1EAF */  jal       evt_get_variable
-/* 9DAC70 80243C50 8C450000 */   lw       $a1, ($v0)
-/* 9DAC74 80243C54 3C018025 */  lui       $at, %hi(D_80252404_9E9424)
-/* 9DAC78 80243C58 AC222404 */  sw        $v0, %lo(D_80252404_9E9424)($at)
-/* 9DAC7C 80243C5C 24020002 */  addiu     $v0, $zero, 2
-/* 9DAC80 80243C60 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 9DAC84 80243C64 24030001 */  addiu     $v1, $zero, 1
-/* 9DAC88 80243C68 3C018025 */  lui       $at, %hi(D_80252400_9E9420)
-/* 9DAC8C 80243C6C AC232400 */  sw        $v1, %lo(D_80252400_9E9420)($at)
-/* 9DAC90 80243C70 03E00008 */  jr        $ra
-/* 9DAC94 80243C74 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s
index 0bb2daf55b..3d8395c3bd 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s
@@ -6,11 +6,11 @@ glabel func_80240B24_BBDCC4
 /* BBDCC8 80240B28 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BBDCCC 80240B2C 10A00003 */  beqz      $a1, .L80240B3C
 /* BBDCD0 80240B30 8C86000C */   lw       $a2, 0xc($a0)
-/* BBDCD4 80240B34 3C018024 */  lui       $at, %hi(D_80244154_BC12F4)
-/* BBDCD8 80240B38 AC204154 */  sw        $zero, %lo(D_80244154_BC12F4)($at)
+/* BBDCD4 80240B34 3C018024 */  lui       $at, %hi(obk_01_ItemChoice_HasSelectedItem)
+/* BBDCD8 80240B38 AC204154 */  sw        $zero, %lo(obk_01_ItemChoice_HasSelectedItem)($at)
 .L80240B3C:
-/* BBDCDC 80240B3C 3C038024 */  lui       $v1, %hi(D_80244154_BC12F4)
-/* BBDCE0 80240B40 24634154 */  addiu     $v1, $v1, %lo(D_80244154_BC12F4)
+/* BBDCDC 80240B3C 3C038024 */  lui       $v1, %hi(obk_01_ItemChoice_HasSelectedItem)
+/* BBDCE0 80240B40 24634154 */  addiu     $v1, $v1, %lo(obk_01_ItemChoice_HasSelectedItem)
 /* BBDCE4 80240B44 8C620000 */  lw        $v0, ($v1)
 /* BBDCE8 80240B48 54400003 */  bnel      $v0, $zero, .L80240B58
 /* BBDCEC 80240B4C AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240B24_BBDCC4
 /* BBDCF4 80240B54 0000102D */   daddu    $v0, $zero, $zero
 .L80240B58:
 /* BBDCF8 80240B58 8CC50000 */  lw        $a1, ($a2)
-/* BBDCFC 80240B5C 3C068024 */  lui       $a2, %hi(D_80244158_BC12F8)
+/* BBDCFC 80240B5C 3C068024 */  lui       $a2, %hi(obk_01_ItemChoice_SelectedItemID)
 /* BBDD00 80240B60 0C0B2026 */  jal       evt_set_variable
-/* BBDD04 80240B64 8CC64158 */   lw       $a2, %lo(D_80244158_BC12F8)($a2)
+/* BBDD04 80240B64 8CC64158 */   lw       $a2, %lo(obk_01_ItemChoice_SelectedItemID)($a2)
 /* BBDD08 80240B68 24020002 */  addiu     $v0, $zero, 2
 .L80240B6C:
 /* BBDD0C 80240B6C 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B78_BBDD18.s b/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B78_BBDD18.s
deleted file mode 100644
index bf02719737..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B78_BBDD18.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240B78_BBDD18
-/* BBDD18 80240B78 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BBDD1C 80240B7C AFBF0010 */  sw        $ra, 0x10($sp)
-/* BBDD20 80240B80 8C82000C */  lw        $v0, 0xc($a0)
-/* BBDD24 80240B84 0C0B1EAF */  jal       evt_get_variable
-/* BBDD28 80240B88 8C450000 */   lw       $a1, ($v0)
-/* BBDD2C 80240B8C 3C018024 */  lui       $at, %hi(D_80244158_BC12F8)
-/* BBDD30 80240B90 AC224158 */  sw        $v0, %lo(D_80244158_BC12F8)($at)
-/* BBDD34 80240B94 24020002 */  addiu     $v0, $zero, 2
-/* BBDD38 80240B98 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BBDD3C 80240B9C 24030001 */  addiu     $v1, $zero, 1
-/* BBDD40 80240BA0 3C018024 */  lui       $at, %hi(D_80244154_BC12F4)
-/* BBDD44 80240BA4 AC234154 */  sw        $v1, %lo(D_80244154_BC12F4)($at)
-/* BBDD48 80240BA8 03E00008 */  jr        $ra
-/* BBDD4C 80240BAC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s
index 4188c4ac7b..119e3f47fd 100644
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s
+++ b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s
@@ -6,11 +6,11 @@ glabel func_802404B4_BC4734
 /* BC4738 802404B8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* BC473C 802404BC 10A00003 */  beqz      $a1, .L802404CC
 /* BC4740 802404C0 8C86000C */   lw       $a2, 0xc($a0)
-/* BC4744 802404C4 3C018024 */  lui       $at, %hi(D_80242F30_BC71B0)
-/* BC4748 802404C8 AC202F30 */  sw        $zero, %lo(D_80242F30_BC71B0)($at)
+/* BC4744 802404C4 3C018024 */  lui       $at, %hi(obk_03_ItemChoice_HasSelectedItem)
+/* BC4748 802404C8 AC202F30 */  sw        $zero, %lo(obk_03_ItemChoice_HasSelectedItem)($at)
 .L802404CC:
-/* BC474C 802404CC 3C038024 */  lui       $v1, %hi(D_80242F30_BC71B0)
-/* BC4750 802404D0 24632F30 */  addiu     $v1, $v1, %lo(D_80242F30_BC71B0)
+/* BC474C 802404CC 3C038024 */  lui       $v1, %hi(obk_03_ItemChoice_HasSelectedItem)
+/* BC4750 802404D0 24632F30 */  addiu     $v1, $v1, %lo(obk_03_ItemChoice_HasSelectedItem)
 /* BC4754 802404D4 8C620000 */  lw        $v0, ($v1)
 /* BC4758 802404D8 54400003 */  bnel      $v0, $zero, .L802404E8
 /* BC475C 802404DC AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802404B4_BC4734
 /* BC4764 802404E4 0000102D */   daddu    $v0, $zero, $zero
 .L802404E8:
 /* BC4768 802404E8 8CC50000 */  lw        $a1, ($a2)
-/* BC476C 802404EC 3C068024 */  lui       $a2, %hi(D_80242F34_BC71B4)
+/* BC476C 802404EC 3C068024 */  lui       $a2, %hi(obk_03_ItemChoice_SelectedItemID)
 /* BC4770 802404F0 0C0B2026 */  jal       evt_set_variable
-/* BC4774 802404F4 8CC62F34 */   lw       $a2, %lo(D_80242F34_BC71B4)($a2)
+/* BC4774 802404F4 8CC62F34 */   lw       $a2, %lo(obk_03_ItemChoice_SelectedItemID)($a2)
 /* BC4778 802404F8 24020002 */  addiu     $v0, $zero, 2
 .L802404FC:
 /* BC477C 802404FC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240508_BC4788.s b/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240508_BC4788.s
deleted file mode 100644
index 13bfb7981e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240508_BC4788.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240508_BC4788
-/* BC4788 80240508 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* BC478C 8024050C AFBF0010 */  sw        $ra, 0x10($sp)
-/* BC4790 80240510 8C82000C */  lw        $v0, 0xc($a0)
-/* BC4794 80240514 0C0B1EAF */  jal       evt_get_variable
-/* BC4798 80240518 8C450000 */   lw       $a1, ($v0)
-/* BC479C 8024051C 3C018024 */  lui       $at, %hi(D_80242F34_BC71B4)
-/* BC47A0 80240520 AC222F34 */  sw        $v0, %lo(D_80242F34_BC71B4)($at)
-/* BC47A4 80240524 24020002 */  addiu     $v0, $zero, 2
-/* BC47A8 80240528 8FBF0010 */  lw        $ra, 0x10($sp)
-/* BC47AC 8024052C 24030001 */  addiu     $v1, $zero, 1
-/* BC47B0 80240530 3C018024 */  lui       $at, %hi(D_80242F30_BC71B0)
-/* BC47B4 80240534 AC232F30 */  sw        $v1, %lo(D_80242F30_BC71B0)($at)
-/* BC47B8 80240538 03E00008 */  jr        $ra
-/* BC47BC 8024053C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s
index 0707ec7ea1..0b17ccce62 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s
@@ -6,11 +6,11 @@ glabel func_80242178_DB4438
 /* DB443C 8024217C AFBF0010 */  sw        $ra, 0x10($sp)
 /* DB4440 80242180 10A00003 */  beqz      $a1, .L80242190
 /* DB4444 80242184 8C86000C */   lw       $a2, 0xc($a0)
-/* DB4448 80242188 3C018024 */  lui       $at, %hi(D_80243098_DB5358)
-/* DB444C 8024218C AC203098 */  sw        $zero, %lo(D_80243098_DB5358)($at)
+/* DB4448 80242188 3C018024 */  lui       $at, %hi(omo_05_ItemChoice_HasSelectedItem)
+/* DB444C 8024218C AC203098 */  sw        $zero, %lo(omo_05_ItemChoice_HasSelectedItem)($at)
 .L80242190:
-/* DB4450 80242190 3C038024 */  lui       $v1, %hi(D_80243098_DB5358)
-/* DB4454 80242194 24633098 */  addiu     $v1, $v1, %lo(D_80243098_DB5358)
+/* DB4450 80242190 3C038024 */  lui       $v1, %hi(omo_05_ItemChoice_HasSelectedItem)
+/* DB4454 80242194 24633098 */  addiu     $v1, $v1, %lo(omo_05_ItemChoice_HasSelectedItem)
 /* DB4458 80242198 8C620000 */  lw        $v0, ($v1)
 /* DB445C 8024219C 54400003 */  bnel      $v0, $zero, .L802421AC
 /* DB4460 802421A0 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80242178_DB4438
 /* DB4468 802421A8 0000102D */   daddu    $v0, $zero, $zero
 .L802421AC:
 /* DB446C 802421AC 8CC50000 */  lw        $a1, ($a2)
-/* DB4470 802421B0 3C068024 */  lui       $a2, %hi(D_8024309C_DB535C)
+/* DB4470 802421B0 3C068024 */  lui       $a2, %hi(omo_05_ItemChoice_SelectedItemID)
 /* DB4474 802421B4 0C0B2026 */  jal       evt_set_variable
-/* DB4478 802421B8 8CC6309C */   lw       $a2, %lo(D_8024309C_DB535C)($a2)
+/* DB4478 802421B8 8CC6309C */   lw       $a2, %lo(omo_05_ItemChoice_SelectedItemID)($a2)
 /* DB447C 802421BC 24020002 */  addiu     $v0, $zero, 2
 .L802421C0:
 /* DB4480 802421C0 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s
deleted file mode 100644
index 8bf06362fc..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802421CC_DB448C
-/* DB448C 802421CC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DB4490 802421D0 AFBF0010 */  sw        $ra, 0x10($sp)
-/* DB4494 802421D4 8C82000C */  lw        $v0, 0xc($a0)
-/* DB4498 802421D8 0C0B1EAF */  jal       evt_get_variable
-/* DB449C 802421DC 8C450000 */   lw       $a1, ($v0)
-/* DB44A0 802421E0 3C018024 */  lui       $at, %hi(D_8024309C_DB535C)
-/* DB44A4 802421E4 AC22309C */  sw        $v0, %lo(D_8024309C_DB535C)($at)
-/* DB44A8 802421E8 24020002 */  addiu     $v0, $zero, 2
-/* DB44AC 802421EC 8FBF0010 */  lw        $ra, 0x10($sp)
-/* DB44B0 802421F0 24030001 */  addiu     $v1, $zero, 1
-/* DB44B4 802421F4 3C018024 */  lui       $at, %hi(D_80243098_DB5358)
-/* DB44B8 802421F8 AC233098 */  sw        $v1, %lo(D_80243098_DB5358)($at)
-/* DB44BC 802421FC 03E00008 */  jr        $ra
-/* DB44C0 80242200 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s
index 853fc595df..e3d8c7044f 100644
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s
+++ b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s
@@ -6,11 +6,11 @@ glabel func_80240F00_DE3390
 /* DE3394 80240F04 AFBF0010 */  sw        $ra, 0x10($sp)
 /* DE3398 80240F08 10A00003 */  beqz      $a1, .L80240F18
 /* DE339C 80240F0C 8C86000C */   lw       $a2, 0xc($a0)
-/* DE33A0 80240F10 3C018024 */  lui       $at, %hi(D_80241C04_DE4094)
-/* DE33A4 80240F14 AC201C04 */  sw        $zero, %lo(D_80241C04_DE4094)($at)
+/* DE33A0 80240F10 3C018024 */  lui       $at, %hi(omo_13_ItemChoice_HasSelectedItem)
+/* DE33A4 80240F14 AC201C04 */  sw        $zero, %lo(omo_13_ItemChoice_HasSelectedItem)($at)
 .L80240F18:
-/* DE33A8 80240F18 3C038024 */  lui       $v1, %hi(D_80241C04_DE4094)
-/* DE33AC 80240F1C 24631C04 */  addiu     $v1, $v1, %lo(D_80241C04_DE4094)
+/* DE33A8 80240F18 3C038024 */  lui       $v1, %hi(omo_13_ItemChoice_HasSelectedItem)
+/* DE33AC 80240F1C 24631C04 */  addiu     $v1, $v1, %lo(omo_13_ItemChoice_HasSelectedItem)
 /* DE33B0 80240F20 8C620000 */  lw        $v0, ($v1)
 /* DE33B4 80240F24 54400003 */  bnel      $v0, $zero, .L80240F34
 /* DE33B8 80240F28 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80240F00_DE3390
 /* DE33C0 80240F30 0000102D */   daddu    $v0, $zero, $zero
 .L80240F34:
 /* DE33C4 80240F34 8CC50000 */  lw        $a1, ($a2)
-/* DE33C8 80240F38 3C068024 */  lui       $a2, %hi(D_80241C08_DE4098)
+/* DE33C8 80240F38 3C068024 */  lui       $a2, %hi(omo_13_ItemChoice_SelectedItemID)
 /* DE33CC 80240F3C 0C0B2026 */  jal       evt_set_variable
-/* DE33D0 80240F40 8CC61C08 */   lw       $a2, %lo(D_80241C08_DE4098)($a2)
+/* DE33D0 80240F40 8CC61C08 */   lw       $a2, %lo(omo_13_ItemChoice_SelectedItemID)($a2)
 /* DE33D4 80240F44 24020002 */  addiu     $v0, $zero, 2
 .L80240F48:
 /* DE33D8 80240F48 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F54_DE33E4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F54_DE33E4.s
deleted file mode 100644
index 372b286544..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F54_DE33E4.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F54_DE33E4
-/* DE33E4 80240F54 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* DE33E8 80240F58 AFBF0010 */  sw        $ra, 0x10($sp)
-/* DE33EC 80240F5C 8C82000C */  lw        $v0, 0xc($a0)
-/* DE33F0 80240F60 0C0B1EAF */  jal       evt_get_variable
-/* DE33F4 80240F64 8C450000 */   lw       $a1, ($v0)
-/* DE33F8 80240F68 3C018024 */  lui       $at, %hi(D_80241C08_DE4098)
-/* DE33FC 80240F6C AC221C08 */  sw        $v0, %lo(D_80241C08_DE4098)($at)
-/* DE3400 80240F70 24020002 */  addiu     $v0, $zero, 2
-/* DE3404 80240F74 8FBF0010 */  lw        $ra, 0x10($sp)
-/* DE3408 80240F78 24030001 */  addiu     $v1, $zero, 1
-/* DE340C 80240F7C 3C018024 */  lui       $at, %hi(D_80241C04_DE4094)
-/* DE3410 80240F80 AC231C04 */  sw        $v1, %lo(D_80241C04_DE4094)($at)
-/* DE3414 80240F84 03E00008 */  jr        $ra
-/* DE3418 80240F88 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s
index ea2d8cb80a..6ee2f49250 100644
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s
+++ b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s
@@ -6,11 +6,11 @@ glabel func_802406A4_AB0694
 /* AB0698 802406A8 AFBF0010 */  sw        $ra, 0x10($sp)
 /* AB069C 802406AC 10A00003 */  beqz      $a1, .L802406BC
 /* AB06A0 802406B0 8C86000C */   lw       $a2, 0xc($a0)
-/* AB06A4 802406B4 3C018024 */  lui       $at, %hi(D_8024121C_AB120C)
-/* AB06A8 802406B8 AC20121C */  sw        $zero, %lo(D_8024121C_AB120C)($at)
+/* AB06A4 802406B4 3C018024 */  lui       $at, %hi(osr_01_ItemChoice_HasSelectedItem)
+/* AB06A8 802406B8 AC20121C */  sw        $zero, %lo(osr_01_ItemChoice_HasSelectedItem)($at)
 .L802406BC:
-/* AB06AC 802406BC 3C038024 */  lui       $v1, %hi(D_8024121C_AB120C)
-/* AB06B0 802406C0 2463121C */  addiu     $v1, $v1, %lo(D_8024121C_AB120C)
+/* AB06AC 802406BC 3C038024 */  lui       $v1, %hi(osr_01_ItemChoice_HasSelectedItem)
+/* AB06B0 802406C0 2463121C */  addiu     $v1, $v1, %lo(osr_01_ItemChoice_HasSelectedItem)
 /* AB06B4 802406C4 8C620000 */  lw        $v0, ($v1)
 /* AB06B8 802406C8 54400003 */  bnel      $v0, $zero, .L802406D8
 /* AB06BC 802406CC AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802406A4_AB0694
 /* AB06C4 802406D4 0000102D */   daddu    $v0, $zero, $zero
 .L802406D8:
 /* AB06C8 802406D8 8CC50000 */  lw        $a1, ($a2)
-/* AB06CC 802406DC 3C068024 */  lui       $a2, %hi(D_80241220_AB1210)
+/* AB06CC 802406DC 3C068024 */  lui       $a2, %hi(osr_01_ItemChoice_SelectedItemID)
 /* AB06D0 802406E0 0C0B2026 */  jal       evt_set_variable
-/* AB06D4 802406E4 8CC61220 */   lw       $a2, %lo(D_80241220_AB1210)($a2)
+/* AB06D4 802406E4 8CC61220 */   lw       $a2, %lo(osr_01_ItemChoice_SelectedItemID)($a2)
 /* AB06D8 802406E8 24020002 */  addiu     $v0, $zero, 2
 .L802406EC:
 /* AB06DC 802406EC 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s b/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s
deleted file mode 100644
index 434492c472..0000000000
--- a/ver/us/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802406F8_AB06E8
-/* AB06E8 802406F8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* AB06EC 802406FC AFBF0010 */  sw        $ra, 0x10($sp)
-/* AB06F0 80240700 8C82000C */  lw        $v0, 0xc($a0)
-/* AB06F4 80240704 0C0B1EAF */  jal       evt_get_variable
-/* AB06F8 80240708 8C450000 */   lw       $a1, ($v0)
-/* AB06FC 8024070C 3C018024 */  lui       $at, %hi(D_80241220_AB1210)
-/* AB0700 80240710 AC221220 */  sw        $v0, %lo(D_80241220_AB1210)($at)
-/* AB0704 80240714 24020002 */  addiu     $v0, $zero, 2
-/* AB0708 80240718 8FBF0010 */  lw        $ra, 0x10($sp)
-/* AB070C 8024071C 24030001 */  addiu     $v1, $zero, 1
-/* AB0710 80240720 3C018024 */  lui       $at, %hi(D_8024121C_AB120C)
-/* AB0714 80240724 AC23121C */  sw        $v1, %lo(D_8024121C_AB120C)($at)
-/* AB0718 80240728 03E00008 */  jr        $ra
-/* AB071C 8024072C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s
index 4cfd1adfd6..97d3cbbf03 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s
@@ -6,11 +6,11 @@ glabel func_802411AC_D4E1EC
 /* D4E1F0 802411B0 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D4E1F4 802411B4 10A00003 */  beqz      $a1, .L802411C4
 /* D4E1F8 802411B8 8C86000C */   lw       $a2, 0xc($a0)
-/* D4E1FC 802411BC 3C018024 */  lui       $at, %hi(D_80241F94_D4EFD4)
-/* D4E200 802411C0 AC201F94 */  sw        $zero, %lo(D_80241F94_D4EFD4)($at)
+/* D4E1FC 802411BC 3C018024 */  lui       $at, %hi(pra_01_ItemChoice_HasSelectedItem)
+/* D4E200 802411C0 AC201F94 */  sw        $zero, %lo(pra_01_ItemChoice_HasSelectedItem)($at)
 .L802411C4:
-/* D4E204 802411C4 3C038024 */  lui       $v1, %hi(D_80241F94_D4EFD4)
-/* D4E208 802411C8 24631F94 */  addiu     $v1, $v1, %lo(D_80241F94_D4EFD4)
+/* D4E204 802411C4 3C038024 */  lui       $v1, %hi(pra_01_ItemChoice_HasSelectedItem)
+/* D4E208 802411C8 24631F94 */  addiu     $v1, $v1, %lo(pra_01_ItemChoice_HasSelectedItem)
 /* D4E20C 802411CC 8C620000 */  lw        $v0, ($v1)
 /* D4E210 802411D0 54400003 */  bnel      $v0, $zero, .L802411E0
 /* D4E214 802411D4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_802411AC_D4E1EC
 /* D4E21C 802411DC 0000102D */   daddu    $v0, $zero, $zero
 .L802411E0:
 /* D4E220 802411E0 8CC50000 */  lw        $a1, ($a2)
-/* D4E224 802411E4 3C068024 */  lui       $a2, %hi(D_80241F98_D4EFD8)
+/* D4E224 802411E4 3C068024 */  lui       $a2, %hi(pra_01_ItemChoice_SelectedItemID)
 /* D4E228 802411E8 0C0B2026 */  jal       evt_set_variable
-/* D4E22C 802411EC 8CC61F98 */   lw       $a2, %lo(D_80241F98_D4EFD8)($a2)
+/* D4E22C 802411EC 8CC61F98 */   lw       $a2, %lo(pra_01_ItemChoice_SelectedItemID)($a2)
 /* D4E230 802411F0 24020002 */  addiu     $v0, $zero, 2
 .L802411F4:
 /* D4E234 802411F4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s b/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s
deleted file mode 100644
index 106143bc30..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241200_D4E240
-/* D4E240 80241200 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D4E244 80241204 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D4E248 80241208 8C82000C */  lw        $v0, 0xc($a0)
-/* D4E24C 8024120C 0C0B1EAF */  jal       evt_get_variable
-/* D4E250 80241210 8C450000 */   lw       $a1, ($v0)
-/* D4E254 80241214 3C018024 */  lui       $at, %hi(D_80241F98_D4EFD8)
-/* D4E258 80241218 AC221F98 */  sw        $v0, %lo(D_80241F98_D4EFD8)($at)
-/* D4E25C 8024121C 24020002 */  addiu     $v0, $zero, 2
-/* D4E260 80241220 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D4E264 80241224 24030001 */  addiu     $v1, $zero, 1
-/* D4E268 80241228 3C018024 */  lui       $at, %hi(D_80241F94_D4EFD4)
-/* D4E26C 8024122C AC231F94 */  sw        $v1, %lo(D_80241F94_D4EFD4)($at)
-/* D4E270 80241230 03E00008 */  jr        $ra
-/* D4E274 80241234 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s
index f92691330c..95189dd0d9 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s
@@ -6,11 +6,11 @@ glabel func_8024114C_D5113C
 /* D51140 80241150 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D51144 80241154 10A00003 */  beqz      $a1, .L80241164
 /* D51148 80241158 8C86000C */   lw       $a2, 0xc($a0)
-/* D5114C 8024115C 3C018024 */  lui       $at, %hi(D_80242ACC_D52ABC)
-/* D51150 80241160 AC202ACC */  sw        $zero, %lo(D_80242ACC_D52ABC)($at)
+/* D5114C 8024115C 3C018024 */  lui       $at, %hi(pra_02_ItemChoice_HasSelectedItem)
+/* D51150 80241160 AC202ACC */  sw        $zero, %lo(pra_02_ItemChoice_HasSelectedItem)($at)
 .L80241164:
-/* D51154 80241164 3C038024 */  lui       $v1, %hi(D_80242ACC_D52ABC)
-/* D51158 80241168 24632ACC */  addiu     $v1, $v1, %lo(D_80242ACC_D52ABC)
+/* D51154 80241164 3C038024 */  lui       $v1, %hi(pra_02_ItemChoice_HasSelectedItem)
+/* D51158 80241168 24632ACC */  addiu     $v1, $v1, %lo(pra_02_ItemChoice_HasSelectedItem)
 /* D5115C 8024116C 8C620000 */  lw        $v0, ($v1)
 /* D51160 80241170 54400003 */  bnel      $v0, $zero, .L80241180
 /* D51164 80241174 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024114C_D5113C
 /* D5116C 8024117C 0000102D */   daddu    $v0, $zero, $zero
 .L80241180:
 /* D51170 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D51174 80241184 3C068024 */  lui       $a2, %hi(D_80242AD0_D52AC0)
+/* D51174 80241184 3C068024 */  lui       $a2, %hi(pra_02_ItemChoice_SelectedItemID)
 /* D51178 80241188 0C0B2026 */  jal       evt_set_variable
-/* D5117C 8024118C 8CC62AD0 */   lw       $a2, %lo(D_80242AD0_D52AC0)($a2)
+/* D5117C 8024118C 8CC62AD0 */   lw       $a2, %lo(pra_02_ItemChoice_SelectedItemID)($a2)
 /* D51180 80241190 24020002 */  addiu     $v0, $zero, 2
 .L80241194:
 /* D51184 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411A0_D51190.s b/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411A0_D51190.s
deleted file mode 100644
index 77fcb1fce9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411A0_D51190.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411A0_D51190
-/* D51190 802411A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D51194 802411A4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D51198 802411A8 8C82000C */  lw        $v0, 0xc($a0)
-/* D5119C 802411AC 0C0B1EAF */  jal       evt_get_variable
-/* D511A0 802411B0 8C450000 */   lw       $a1, ($v0)
-/* D511A4 802411B4 3C018024 */  lui       $at, %hi(D_80242AD0_D52AC0)
-/* D511A8 802411B8 AC222AD0 */  sw        $v0, %lo(D_80242AD0_D52AC0)($at)
-/* D511AC 802411BC 24020002 */  addiu     $v0, $zero, 2
-/* D511B0 802411C0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D511B4 802411C4 24030001 */  addiu     $v1, $zero, 1
-/* D511B8 802411C8 3C018024 */  lui       $at, %hi(D_80242ACC_D52ABC)
-/* D511BC 802411CC AC232ACC */  sw        $v1, %lo(D_80242ACC_D52ABC)($at)
-/* D511C0 802411D0 03E00008 */  jr        $ra
-/* D511C4 802411D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s
index 1689844e8b..50cf049824 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s
@@ -6,11 +6,11 @@ glabel func_8024114C_D599DC
 /* D599E0 80241150 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D599E4 80241154 10A00003 */  beqz      $a1, .L80241164
 /* D599E8 80241158 8C86000C */   lw       $a2, 0xc($a0)
-/* D599EC 8024115C 3C018024 */  lui       $at, %hi(D_80241D98_D5A628)
-/* D599F0 80241160 AC201D98 */  sw        $zero, %lo(D_80241D98_D5A628)($at)
+/* D599EC 8024115C 3C018024 */  lui       $at, %hi(pra_09_ItemChoice_HasSelectedItem)
+/* D599F0 80241160 AC201D98 */  sw        $zero, %lo(pra_09_ItemChoice_HasSelectedItem)($at)
 .L80241164:
-/* D599F4 80241164 3C038024 */  lui       $v1, %hi(D_80241D98_D5A628)
-/* D599F8 80241168 24631D98 */  addiu     $v1, $v1, %lo(D_80241D98_D5A628)
+/* D599F4 80241164 3C038024 */  lui       $v1, %hi(pra_09_ItemChoice_HasSelectedItem)
+/* D599F8 80241168 24631D98 */  addiu     $v1, $v1, %lo(pra_09_ItemChoice_HasSelectedItem)
 /* D599FC 8024116C 8C620000 */  lw        $v0, ($v1)
 /* D59A00 80241170 54400003 */  bnel      $v0, $zero, .L80241180
 /* D59A04 80241174 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024114C_D599DC
 /* D59A0C 8024117C 0000102D */   daddu    $v0, $zero, $zero
 .L80241180:
 /* D59A10 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D59A14 80241184 3C068024 */  lui       $a2, %hi(D_80241D9C_D5A62C)
+/* D59A14 80241184 3C068024 */  lui       $a2, %hi(pra_09_ItemChoice_SelectedItemID)
 /* D59A18 80241188 0C0B2026 */  jal       evt_set_variable
-/* D59A1C 8024118C 8CC61D9C */   lw       $a2, %lo(D_80241D9C_D5A62C)($a2)
+/* D59A1C 8024118C 8CC61D9C */   lw       $a2, %lo(pra_09_ItemChoice_SelectedItemID)($a2)
 /* D59A20 80241190 24020002 */  addiu     $v0, $zero, 2
 .L80241194:
 /* D59A24 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411A0_D59A30.s b/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411A0_D59A30.s
deleted file mode 100644
index a143013446..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802411A0_D59A30.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411A0_D59A30
-/* D59A30 802411A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D59A34 802411A4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D59A38 802411A8 8C82000C */  lw        $v0, 0xc($a0)
-/* D59A3C 802411AC 0C0B1EAF */  jal       evt_get_variable
-/* D59A40 802411B0 8C450000 */   lw       $a1, ($v0)
-/* D59A44 802411B4 3C018024 */  lui       $at, %hi(D_80241D9C_D5A62C)
-/* D59A48 802411B8 AC221D9C */  sw        $v0, %lo(D_80241D9C_D5A62C)($at)
-/* D59A4C 802411BC 24020002 */  addiu     $v0, $zero, 2
-/* D59A50 802411C0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D59A54 802411C4 24030001 */  addiu     $v1, $zero, 1
-/* D59A58 802411C8 3C018024 */  lui       $at, %hi(D_80241D98_D5A628)
-/* D59A5C 802411CC AC231D98 */  sw        $v1, %lo(D_80241D98_D5A628)($at)
-/* D59A60 802411D0 03E00008 */  jr        $ra
-/* D59A64 802411D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s
index e94c08a1ab..4bfbb8dd5e 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s
@@ -6,11 +6,11 @@ glabel func_8024114C_D6572C
 /* D65730 80241150 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D65734 80241154 10A00003 */  beqz      $a1, .L80241164
 /* D65738 80241158 8C86000C */   lw       $a2, 0xc($a0)
-/* D6573C 8024115C 3C018024 */  lui       $at, %hi(D_802422CC_D668AC)
-/* D65740 80241160 AC2022CC */  sw        $zero, %lo(D_802422CC_D668AC)($at)
+/* D6573C 8024115C 3C018024 */  lui       $at, %hi(pra_13_ItemChoice_HasSelectedItem)
+/* D65740 80241160 AC2022CC */  sw        $zero, %lo(pra_13_ItemChoice_HasSelectedItem)($at)
 .L80241164:
-/* D65744 80241164 3C038024 */  lui       $v1, %hi(D_802422CC_D668AC)
-/* D65748 80241168 246322CC */  addiu     $v1, $v1, %lo(D_802422CC_D668AC)
+/* D65744 80241164 3C038024 */  lui       $v1, %hi(pra_13_ItemChoice_HasSelectedItem)
+/* D65748 80241168 246322CC */  addiu     $v1, $v1, %lo(pra_13_ItemChoice_HasSelectedItem)
 /* D6574C 8024116C 8C620000 */  lw        $v0, ($v1)
 /* D65750 80241170 54400003 */  bnel      $v0, $zero, .L80241180
 /* D65754 80241174 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024114C_D6572C
 /* D6575C 8024117C 0000102D */   daddu    $v0, $zero, $zero
 .L80241180:
 /* D65760 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D65764 80241184 3C068024 */  lui       $a2, %hi(D_802422D0_D668B0)
+/* D65764 80241184 3C068024 */  lui       $a2, %hi(pra_13_ItemChoice_SelectedItemID)
 /* D65768 80241188 0C0B2026 */  jal       evt_set_variable
-/* D6576C 8024118C 8CC622D0 */   lw       $a2, %lo(D_802422D0_D668B0)($a2)
+/* D6576C 8024118C 8CC622D0 */   lw       $a2, %lo(pra_13_ItemChoice_SelectedItemID)($a2)
 /* D65770 80241190 24020002 */  addiu     $v0, $zero, 2
 .L80241194:
 /* D65774 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411A0_D65780.s b/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411A0_D65780.s
deleted file mode 100644
index 4c6bfb0e9d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802411A0_D65780.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411A0_D65780
-/* D65780 802411A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D65784 802411A4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D65788 802411A8 8C82000C */  lw        $v0, 0xc($a0)
-/* D6578C 802411AC 0C0B1EAF */  jal       evt_get_variable
-/* D65790 802411B0 8C450000 */   lw       $a1, ($v0)
-/* D65794 802411B4 3C018024 */  lui       $at, %hi(D_802422D0_D668B0)
-/* D65798 802411B8 AC2222D0 */  sw        $v0, %lo(D_802422D0_D668B0)($at)
-/* D6579C 802411BC 24020002 */  addiu     $v0, $zero, 2
-/* D657A0 802411C0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D657A4 802411C4 24030001 */  addiu     $v1, $zero, 1
-/* D657A8 802411C8 3C018024 */  lui       $at, %hi(D_802422CC_D668AC)
-/* D657AC 802411CC AC2322CC */  sw        $v1, %lo(D_802422CC_D668AC)($at)
-/* D657B0 802411D0 03E00008 */  jr        $ra
-/* D657B4 802411D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s
index 38b34325fb..6c6a7e87ae 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s
@@ -6,11 +6,11 @@ glabel func_8024114C_D6FAFC
 /* D6FB00 80241150 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D6FB04 80241154 10A00003 */  beqz      $a1, .L80241164
 /* D6FB08 80241158 8C86000C */   lw       $a2, 0xc($a0)
-/* D6FB0C 8024115C 3C018024 */  lui       $at, %hi(D_8024219C_D70B4C)
-/* D6FB10 80241160 AC20219C */  sw        $zero, %lo(D_8024219C_D70B4C)($at)
+/* D6FB0C 8024115C 3C018024 */  lui       $at, %hi(pra_19_ItemChoice_HasSelectedItem)
+/* D6FB10 80241160 AC20219C */  sw        $zero, %lo(pra_19_ItemChoice_HasSelectedItem)($at)
 .L80241164:
-/* D6FB14 80241164 3C038024 */  lui       $v1, %hi(D_8024219C_D70B4C)
-/* D6FB18 80241168 2463219C */  addiu     $v1, $v1, %lo(D_8024219C_D70B4C)
+/* D6FB14 80241164 3C038024 */  lui       $v1, %hi(pra_19_ItemChoice_HasSelectedItem)
+/* D6FB18 80241168 2463219C */  addiu     $v1, $v1, %lo(pra_19_ItemChoice_HasSelectedItem)
 /* D6FB1C 8024116C 8C620000 */  lw        $v0, ($v1)
 /* D6FB20 80241170 54400003 */  bnel      $v0, $zero, .L80241180
 /* D6FB24 80241174 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024114C_D6FAFC
 /* D6FB2C 8024117C 0000102D */   daddu    $v0, $zero, $zero
 .L80241180:
 /* D6FB30 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D6FB34 80241184 3C068024 */  lui       $a2, %hi(D_802421A0_D70B50)
+/* D6FB34 80241184 3C068024 */  lui       $a2, %hi(pra_19_ItemChoice_SelectedItemID)
 /* D6FB38 80241188 0C0B2026 */  jal       evt_set_variable
-/* D6FB3C 8024118C 8CC621A0 */   lw       $a2, %lo(D_802421A0_D70B50)($a2)
+/* D6FB3C 8024118C 8CC621A0 */   lw       $a2, %lo(pra_19_ItemChoice_SelectedItemID)($a2)
 /* D6FB40 80241190 24020002 */  addiu     $v0, $zero, 2
 .L80241194:
 /* D6FB44 80241194 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s b/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s
deleted file mode 100644
index 597bdb624b..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411A0_D6FB50
-/* D6FB50 802411A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D6FB54 802411A4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D6FB58 802411A8 8C82000C */  lw        $v0, 0xc($a0)
-/* D6FB5C 802411AC 0C0B1EAF */  jal       evt_get_variable
-/* D6FB60 802411B0 8C450000 */   lw       $a1, ($v0)
-/* D6FB64 802411B4 3C018024 */  lui       $at, %hi(D_802421A0_D70B50)
-/* D6FB68 802411B8 AC2221A0 */  sw        $v0, %lo(D_802421A0_D70B50)($at)
-/* D6FB6C 802411BC 24020002 */  addiu     $v0, $zero, 2
-/* D6FB70 802411C0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D6FB74 802411C4 24030001 */  addiu     $v1, $zero, 1
-/* D6FB78 802411C8 3C018024 */  lui       $at, %hi(D_8024219C_D70B4C)
-/* D6FB7C 802411CC AC23219C */  sw        $v1, %lo(D_8024219C_D70B4C)($at)
-/* D6FB80 802411D0 03E00008 */  jr        $ra
-/* D6FB84 802411D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s
index 4ef7439aae..f72ff89435 100644
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s
+++ b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s
@@ -6,11 +6,11 @@ glabel func_8024024C_D7EFAC
 /* D7EFB0 80240250 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D7EFB4 80240254 10A00003 */  beqz      $a1, .L80240264
 /* D7EFB8 80240258 8C86000C */   lw       $a2, 0xc($a0)
-/* D7EFBC 8024025C 3C018024 */  lui       $at, %hi(D_8024119C_D7FEFC)
-/* D7EFC0 80240260 AC20119C */  sw        $zero, %lo(D_8024119C_D7FEFC)($at)
+/* D7EFBC 8024025C 3C018024 */  lui       $at, %hi(pra_31_ItemChoice_HasSelectedItem)
+/* D7EFC0 80240260 AC20119C */  sw        $zero, %lo(pra_31_ItemChoice_HasSelectedItem)($at)
 .L80240264:
-/* D7EFC4 80240264 3C038024 */  lui       $v1, %hi(D_8024119C_D7FEFC)
-/* D7EFC8 80240268 2463119C */  addiu     $v1, $v1, %lo(D_8024119C_D7FEFC)
+/* D7EFC4 80240264 3C038024 */  lui       $v1, %hi(pra_31_ItemChoice_HasSelectedItem)
+/* D7EFC8 80240268 2463119C */  addiu     $v1, $v1, %lo(pra_31_ItemChoice_HasSelectedItem)
 /* D7EFCC 8024026C 8C620000 */  lw        $v0, ($v1)
 /* D7EFD0 80240270 54400003 */  bnel      $v0, $zero, .L80240280
 /* D7EFD4 80240274 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024024C_D7EFAC
 /* D7EFDC 8024027C 0000102D */   daddu    $v0, $zero, $zero
 .L80240280:
 /* D7EFE0 80240280 8CC50000 */  lw        $a1, ($a2)
-/* D7EFE4 80240284 3C068024 */  lui       $a2, %hi(D_802411A0_D7FF00)
+/* D7EFE4 80240284 3C068024 */  lui       $a2, %hi(pra_31_ItemChoice_SelectedItemID)
 /* D7EFE8 80240288 0C0B2026 */  jal       evt_set_variable
-/* D7EFEC 8024028C 8CC611A0 */   lw       $a2, %lo(D_802411A0_D7FF00)($a2)
+/* D7EFEC 8024028C 8CC611A0 */   lw       $a2, %lo(pra_31_ItemChoice_SelectedItemID)($a2)
 /* D7EFF0 80240290 24020002 */  addiu     $v0, $zero, 2
 .L80240294:
 /* D7EFF4 80240294 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s b/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s
deleted file mode 100644
index 2bfcef9509..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402A0_D7F000
-/* D7F000 802402A0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D7F004 802402A4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D7F008 802402A8 8C82000C */  lw        $v0, 0xc($a0)
-/* D7F00C 802402AC 0C0B1EAF */  jal       evt_get_variable
-/* D7F010 802402B0 8C450000 */   lw       $a1, ($v0)
-/* D7F014 802402B4 3C018024 */  lui       $at, %hi(D_802411A0_D7FF00)
-/* D7F018 802402B8 AC2211A0 */  sw        $v0, %lo(D_802411A0_D7FF00)($at)
-/* D7F01C 802402BC 24020002 */  addiu     $v0, $zero, 2
-/* D7F020 802402C0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D7F024 802402C4 24030001 */  addiu     $v1, $zero, 1
-/* D7F028 802402C8 3C018024 */  lui       $at, %hi(D_8024119C_D7FEFC)
-/* D7F02C 802402CC AC23119C */  sw        $v1, %lo(D_8024119C_D7FEFC)($at)
-/* D7F030 802402D0 03E00008 */  jr        $ra
-/* D7F034 802402D4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s
index 53bc153ff7..d30b02dc55 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s
@@ -6,11 +6,11 @@ glabel func_8024053C_CF80AC
 /* CF80B0 80240540 AFBF0010 */  sw        $ra, 0x10($sp)
 /* CF80B4 80240544 10A00003 */  beqz      $a1, .L80240554
 /* CF80B8 80240548 8C86000C */   lw       $a2, 0xc($a0)
-/* CF80BC 8024054C 3C018024 */  lui       $at, %hi(D_802432D0_CFAE40)
-/* CF80C0 80240550 AC2032D0 */  sw        $zero, %lo(D_802432D0_CFAE40)($at)
+/* CF80BC 8024054C 3C018024 */  lui       $at, %hi(sam_01_ItemChoice_HasSelectedItem)
+/* CF80C0 80240550 AC2032D0 */  sw        $zero, %lo(sam_01_ItemChoice_HasSelectedItem)($at)
 .L80240554:
-/* CF80C4 80240554 3C038024 */  lui       $v1, %hi(D_802432D0_CFAE40)
-/* CF80C8 80240558 246332D0 */  addiu     $v1, $v1, %lo(D_802432D0_CFAE40)
+/* CF80C4 80240554 3C038024 */  lui       $v1, %hi(sam_01_ItemChoice_HasSelectedItem)
+/* CF80C8 80240558 246332D0 */  addiu     $v1, $v1, %lo(sam_01_ItemChoice_HasSelectedItem)
 /* CF80CC 8024055C 8C620000 */  lw        $v0, ($v1)
 /* CF80D0 80240560 54400003 */  bnel      $v0, $zero, .L80240570
 /* CF80D4 80240564 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024053C_CF80AC
 /* CF80DC 8024056C 0000102D */   daddu    $v0, $zero, $zero
 .L80240570:
 /* CF80E0 80240570 8CC50000 */  lw        $a1, ($a2)
-/* CF80E4 80240574 3C068024 */  lui       $a2, %hi(D_802432D4_CFAE44)
+/* CF80E4 80240574 3C068024 */  lui       $a2, %hi(sam_01_ItemChoice_SelectedItemID)
 /* CF80E8 80240578 0C0B2026 */  jal       evt_set_variable
-/* CF80EC 8024057C 8CC632D4 */   lw       $a2, %lo(D_802432D4_CFAE44)($a2)
+/* CF80EC 8024057C 8CC632D4 */   lw       $a2, %lo(sam_01_ItemChoice_SelectedItemID)($a2)
 /* CF80F0 80240580 24020002 */  addiu     $v0, $zero, 2
 .L80240584:
 /* CF80F4 80240584 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240590_CF8100.s b/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240590_CF8100.s
deleted file mode 100644
index 084984d137..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240590_CF8100.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240590_CF8100
-/* CF8100 80240590 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* CF8104 80240594 AFBF0010 */  sw        $ra, 0x10($sp)
-/* CF8108 80240598 8C82000C */  lw        $v0, 0xc($a0)
-/* CF810C 8024059C 0C0B1EAF */  jal       evt_get_variable
-/* CF8110 802405A0 8C450000 */   lw       $a1, ($v0)
-/* CF8114 802405A4 3C018024 */  lui       $at, %hi(D_802432D4_CFAE44)
-/* CF8118 802405A8 AC2232D4 */  sw        $v0, %lo(D_802432D4_CFAE44)($at)
-/* CF811C 802405AC 24020002 */  addiu     $v0, $zero, 2
-/* CF8120 802405B0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* CF8124 802405B4 24030001 */  addiu     $v1, $zero, 1
-/* CF8128 802405B8 3C018024 */  lui       $at, %hi(D_802432D0_CFAE40)
-/* CF812C 802405BC AC2332D0 */  sw        $v1, %lo(D_802432D0_CFAE40)($at)
-/* CF8130 802405C0 03E00008 */  jr        $ra
-/* CF8134 802405C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s
index 7f20028fda..197a7a34bb 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s
@@ -6,11 +6,11 @@ glabel func_8024053C_D13B0C
 /* D13B10 80240540 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D13B14 80240544 10A00003 */  beqz      $a1, .L80240554
 /* D13B18 80240548 8C86000C */   lw       $a2, 0xc($a0)
-/* D13B1C 8024054C 3C018024 */  lui       $at, %hi(D_8024387C_D16E4C)
-/* D13B20 80240550 AC20387C */  sw        $zero, %lo(D_8024387C_D16E4C)($at)
+/* D13B1C 8024054C 3C018024 */  lui       $at, %hi(sam_04_ItemChoice_HasSelectedItem)
+/* D13B20 80240550 AC20387C */  sw        $zero, %lo(sam_04_ItemChoice_HasSelectedItem)($at)
 .L80240554:
-/* D13B24 80240554 3C038024 */  lui       $v1, %hi(D_8024387C_D16E4C)
-/* D13B28 80240558 2463387C */  addiu     $v1, $v1, %lo(D_8024387C_D16E4C)
+/* D13B24 80240554 3C038024 */  lui       $v1, %hi(sam_04_ItemChoice_HasSelectedItem)
+/* D13B28 80240558 2463387C */  addiu     $v1, $v1, %lo(sam_04_ItemChoice_HasSelectedItem)
 /* D13B2C 8024055C 8C620000 */  lw        $v0, ($v1)
 /* D13B30 80240560 54400003 */  bnel      $v0, $zero, .L80240570
 /* D13B34 80240564 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_8024053C_D13B0C
 /* D13B3C 8024056C 0000102D */   daddu    $v0, $zero, $zero
 .L80240570:
 /* D13B40 80240570 8CC50000 */  lw        $a1, ($a2)
-/* D13B44 80240574 3C068024 */  lui       $a2, %hi(D_80243880_D16E50)
+/* D13B44 80240574 3C068024 */  lui       $a2, %hi(sam_04_ItemChoice_SelectedItemID)
 /* D13B48 80240578 0C0B2026 */  jal       evt_set_variable
-/* D13B4C 8024057C 8CC63880 */   lw       $a2, %lo(D_80243880_D16E50)($a2)
+/* D13B4C 8024057C 8CC63880 */   lw       $a2, %lo(sam_04_ItemChoice_SelectedItemID)($a2)
 /* D13B50 80240580 24020002 */  addiu     $v0, $zero, 2
 .L80240584:
 /* D13B54 80240584 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s b/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s
deleted file mode 100644
index 0f2649ead5..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240590_D13B60
-/* D13B60 80240590 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D13B64 80240594 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D13B68 80240598 8C82000C */  lw        $v0, 0xc($a0)
-/* D13B6C 8024059C 0C0B1EAF */  jal       evt_get_variable
-/* D13B70 802405A0 8C450000 */   lw       $a1, ($v0)
-/* D13B74 802405A4 3C018024 */  lui       $at, %hi(D_80243880_D16E50)
-/* D13B78 802405A8 AC223880 */  sw        $v0, %lo(D_80243880_D16E50)($at)
-/* D13B7C 802405AC 24020002 */  addiu     $v0, $zero, 2
-/* D13B80 802405B0 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D13B84 802405B4 24030001 */  addiu     $v1, $zero, 1
-/* D13B88 802405B8 3C018024 */  lui       $at, %hi(D_8024387C_D16E4C)
-/* D13B8C 802405BC AC23387C */  sw        $v1, %lo(D_8024387C_D16E4C)($at)
-/* D13B90 802405C0 03E00008 */  jr        $ra
-/* D13B94 802405C4 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s
index 87269dc581..0ad2382c61 100644
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s
+++ b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s
@@ -6,11 +6,11 @@ glabel func_80241D8C_D21C1C
 /* D21C20 80241D90 AFBF0010 */  sw        $ra, 0x10($sp)
 /* D21C24 80241D94 10A00003 */  beqz      $a1, .L80241DA4
 /* D21C28 80241D98 8C86000C */   lw       $a2, 0xc($a0)
-/* D21C2C 80241D9C 3C018024 */  lui       $at, %hi(D_80244434_D242C4)
-/* D21C30 80241DA0 AC204434 */  sw        $zero, %lo(D_80244434_D242C4)($at)
+/* D21C2C 80241D9C 3C018024 */  lui       $at, %hi(sam_06_ItemChoice_HasSelectedItem)
+/* D21C30 80241DA0 AC204434 */  sw        $zero, %lo(sam_06_ItemChoice_HasSelectedItem)($at)
 .L80241DA4:
-/* D21C34 80241DA4 3C038024 */  lui       $v1, %hi(D_80244434_D242C4)
-/* D21C38 80241DA8 24634434 */  addiu     $v1, $v1, %lo(D_80244434_D242C4)
+/* D21C34 80241DA4 3C038024 */  lui       $v1, %hi(sam_06_ItemChoice_HasSelectedItem)
+/* D21C38 80241DA8 24634434 */  addiu     $v1, $v1, %lo(sam_06_ItemChoice_HasSelectedItem)
 /* D21C3C 80241DAC 8C620000 */  lw        $v0, ($v1)
 /* D21C40 80241DB0 54400003 */  bnel      $v0, $zero, .L80241DC0
 /* D21C44 80241DB4 AC600000 */   sw       $zero, ($v1)
@@ -18,9 +18,9 @@ glabel func_80241D8C_D21C1C
 /* D21C4C 80241DBC 0000102D */   daddu    $v0, $zero, $zero
 .L80241DC0:
 /* D21C50 80241DC0 8CC50000 */  lw        $a1, ($a2)
-/* D21C54 80241DC4 3C068024 */  lui       $a2, %hi(D_80244438_D242C8)
+/* D21C54 80241DC4 3C068024 */  lui       $a2, %hi(sam_06_ItemChoice_SelectedItemID)
 /* D21C58 80241DC8 0C0B2026 */  jal       evt_set_variable
-/* D21C5C 80241DCC 8CC64438 */   lw       $a2, %lo(D_80244438_D242C8)($a2)
+/* D21C5C 80241DCC 8CC64438 */   lw       $a2, %lo(sam_06_ItemChoice_SelectedItemID)($a2)
 /* D21C60 80241DD0 24020002 */  addiu     $v0, $zero, 2
 .L80241DD4:
 /* D21C64 80241DD4 8FBF0010 */  lw        $ra, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s
deleted file mode 100644
index 30b7737603..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s
+++ /dev/null
@@ -1,18 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241DE0_D21C70
-/* D21C70 80241DE0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* D21C74 80241DE4 AFBF0010 */  sw        $ra, 0x10($sp)
-/* D21C78 80241DE8 8C82000C */  lw        $v0, 0xc($a0)
-/* D21C7C 80241DEC 0C0B1EAF */  jal       evt_get_variable
-/* D21C80 80241DF0 8C450000 */   lw       $a1, ($v0)
-/* D21C84 80241DF4 3C018024 */  lui       $at, %hi(D_80244438_D242C8)
-/* D21C88 80241DF8 AC224438 */  sw        $v0, %lo(D_80244438_D242C8)($at)
-/* D21C8C 80241DFC 24020002 */  addiu     $v0, $zero, 2
-/* D21C90 80241E00 8FBF0010 */  lw        $ra, 0x10($sp)
-/* D21C94 80241E04 24030001 */  addiu     $v1, $zero, 1
-/* D21C98 80241E08 3C018024 */  lui       $at, %hi(D_80244434_D242C4)
-/* D21C9C 80241E0C AC234434 */  sw        $v1, %lo(D_80244434_D242C4)($at)
-/* D21CA0 80241E10 03E00008 */  jr        $ra
-/* D21CA4 80241E14 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 1d906d5ed5..9849236df8 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -15121,7 +15121,7 @@ mac_00_Quizmo_CreateWorker = 0x80241694; // type:func rom:0x7EC3A4
 mac_00_GetNpcCollisionHeight = 0x802416C4; // type:func rom:0x7EC3D4
 mac_00_AddPlayerHandsOffset = 0x80241720; // type:func rom:0x7EC430
 func_802418F0_7EC600 = 0x802418F0; // type:func rom:0x7EC600
-func_80241944_7EC654 = 0x80241944; // type:func rom:0x7EC654
+mac_00_ItemChoice_SaveSelected = 0x80241944; // type:func rom:0x7EC654
 func_8024197C_7EC68C = 0x8024197C; // type:func rom:0x7EC68C
 func_80241A18_7EC728 = 0x80241A18; // type:func rom:0x7EC728
 mac_00_LetterDelivery_Init = 0x80241AB4; // type:func rom:0x7EC7C4
@@ -15166,15 +15166,15 @@ dup_mac_00_LetterDelivery_RestoreNpcAnim = 0x80243B2C; // type:func rom:0x7EE83C
 mac_00_varStash = 0x80245DC0; // type:data rom:0x7F0AD0
 mac_00_Quizmo_Answers = 0x80245E24; // type:data rom:0x7F0B34
 D_80245E64_7F0B74 = 0x80245E64; // type:data rom:0x7F0B74
-D_802483E8_7F30F8 = 0x802483E8; // type:data rom:0x7F30F8
-D_802483EC_7F30FC = 0x802483EC; // type:data rom:0x7F30FC
+mac_00_ItemChoice_HasSelectedItem = 0x802483E8; // type:data rom:0x7F30F8
+mac_00_ItemChoice_SelectedItemID = 0x802483EC; // type:data rom:0x7F30FC
 D_80248F18_7F3C28 = 0x80248F18; // type:data rom:0x7F3C28
 D_80248F20_7F3C30 = 0x80248F20; // type:data rom:0x7F3C30
 D_80248F28_7F3C38 = 0x80248F28; // type:data rom:0x7F3C38
 mac_00_dojoBattleIDs = 0x8024A632; // type:data rom:0x7F5340
 dup_mac_00_varStash = 0x8024ECE8; // type:data rom:0x7F99F8
-D_8024ED4C_7F9A5C = 0x8024ED4C; // type:data rom:0x7F9A5C
-D_8024ED50_7F9A60 = 0x8024ED50; // type:data rom:0x7F9A60
+mac_00_ItemChoice_HasSelectedItem = 0x8024ED4C; // type:data rom:0x7F9A5C
+mac_00_ItemChoice_SelectedItemID = 0x8024ED50; // type:data rom:0x7F9A60
 D_802559C0_8006D0 = 0x802559C0; // type:data rom:0x8006D0
 D_802559C8_8006D8 = 0x802559C8; // type:data rom:0x8006D8
 func_80240000_800880 = 0x80240000; // type:func rom:0x800880
@@ -15247,7 +15247,7 @@ mac_01_ToadHouse_Stub = 0x80243AA0; // type:func rom:0x804320
 mac_01_GetNpcCollisionHeight = 0x80243AA8; // type:func rom:0x804328
 mac_01_AddPlayerHandsOffset = 0x80243B04; // type:func rom:0x804384
 func_80243CD4_804554 = 0x80243CD4; // type:func rom:0x804554
-func_80243D28_8045A8 = 0x80243D28; // type:func rom:0x8045A8
+mac_01_ItemChoice_SaveSelected = 0x80243D28; // type:func rom:0x8045A8
 func_80243D60_8045E0 = 0x80243D60; // type:func rom:0x8045E0
 mac_01_LetterDelivery_Init = 0x80243DFC; // type:func rom:0x80467C
 mac_01_LetterDelivery_CalcLetterPos = 0x80243EEC; // type:func rom:0x80476C
@@ -15301,8 +15301,8 @@ D_80248714_808F94 = 0x80248714; // type:data rom:0x808F94
 mac_01_varStash = 0x80248C30; // type:data rom:0x8094B0
 mac_01_Quizmo_Answers = 0x80248C94; // type:data rom:0x809514
 D_80248CD4_809554 = 0x80248CD4; // type:data rom:0x809554
-D_8024D944_80E1C4 = 0x8024D944; // type:data rom:0x80E1C4
-D_8024D948_80E1C8 = 0x8024D948; // type:data rom:0x80E1C8
+mac_01_ItemChoice_HasSelectedItem = 0x8024D944; // type:data rom:0x80E1C4
+mac_01_ItemChoice_SelectedItemID = 0x8024D948; // type:data rom:0x80E1C8
 D_80256ADC_81735C = 0x80256ADC; // type:data rom:0x81735C
 D_80256AEC_81736C = 0x80256AEC; // type:data rom:0x81736C
 D_80258404_818C84 = 0x80258404; // type:data rom:0x818C84
@@ -15382,8 +15382,8 @@ mac_02_MonitorMusicProximityTrigger = 0x802433F0; // type:func rom:0x8266B0
 mac_02_varStash = 0x80246150; // type:data rom:0x829410
 mac_02_Quizmo_Answers = 0x802461B4; // type:data rom:0x829474
 D_802461F4_8294B4 = 0x802461F4; // type:data rom:0x8294B4
-D_80248778_82BA38 = 0x80248778; // type:data rom:0x82BA38
-D_8024877C_82BA3C = 0x8024877C; // type:data rom:0x82BA3C
+mac_02_ItemChoice_HasSelectedItem = 0x80248778; // type:data rom:0x82BA38
+mac_02_ItemChoice_SelectedItemID = 0x8024877C; // type:data rom:0x82BA3C
 D_80248A98_82BD58 = 0x80248A98; // type:data rom:0x82BD58
 D_80248B10_82BDD0 = 0x80248B10; // type:data rom:0x82BDD0
 D_80248CB0_82BF70 = 0x80248CB0; // type:data rom:0x82BF70
@@ -15458,8 +15458,8 @@ func_802427D0_833FD0 = 0x802427D0; // type:func rom:0x833FD0
 mac_03_varStash = 0x80246644; // type:data rom:0x837E44
 mac_03_Quizmo_Answers = 0x802466A8; // type:data rom:0x837EA8
 D_802466E8_837EE8 = 0x802466E8; // type:data rom:0x837EE8
-D_80248C6C_83A46C = 0x80248C6C; // type:data rom:0x83A46C
-D_80248C70_83A470 = 0x80248C70; // type:data rom:0x83A470
+mac_03_ItemChoice_HasSelectedItem = 0x80248C6C; // type:data rom:0x83A46C
+mac_03_ItemChoice_SelectedItemID = 0x80248C70; // type:data rom:0x83A470
 D_8024F800_841000 = 0x8024F800; // type:data rom:0x841000
 func_80240000_842BD0 = 0x80240000; // type:func rom:0x842BD0
 func_80240050_842C20 = 0x80240050; // type:func rom:0x842C20
@@ -15521,8 +15521,8 @@ mac_04_MonitorMusicProximityTrigger = 0x80241EF0; // type:func rom:0x844AC0
 mac_04_varStash = 0x80243FE8; // type:data rom:0x846BB8
 mac_04_Quizmo_Answers = 0x8024404C; // type:data rom:0x846C1C
 D_8024408C_846C5C = 0x8024408C; // type:data rom:0x846C5C
-D_80246610_8491E0 = 0x80246610; // type:data rom:0x8491E0
-D_80246614_8491E4 = 0x80246614; // type:data rom:0x8491E4
+mac_04_ItemChoice_HasSelectedItem = 0x80246610; // type:data rom:0x8491E0
+mac_04_ItemChoice_SelectedItemID = 0x80246614; // type:data rom:0x8491E4
 D_8024F550_852120 = 0x8024F550; // type:data rom:0x852120
 D_8024F580_852150 = 0x8024F580; // type:data rom:0x852150
 mac_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x852170
@@ -15603,8 +15603,8 @@ func_80243F0C_85607C = 0x80243F0C; // type:func rom:0x85607C
 mac_05_varStash = 0x802450B0; // type:data rom:0x857220
 mac_05_Quizmo_Answers = 0x80245114; // type:data rom:0x857284
 D_80245154_8572C4 = 0x80245154; // type:data rom:0x8572C4
-D_802476D8_859848 = 0x802476D8; // type:data rom:0x859848
-D_802476DC_85984C = 0x802476DC; // type:data rom:0x85984C
+mac_05_ItemChoice_HasSelectedItem = 0x802476D8; // type:data rom:0x859848
+mac_05_ItemChoice_SelectedItemID = 0x802476DC; // type:data rom:0x85984C
 D_80250A50_862BC0 = 0x80250A50; // type:data rom:0x862BC0
 D_80250A54_862BC4 = 0x80250A54; // type:data rom:0x862BC4
 D_80250A58_862BC8 = 0x80250A58; // type:data rom:0x862BC8
@@ -16138,8 +16138,8 @@ D_80244B2C_8B4B9C = 0x80244B2C; // type:data rom:0x8B4B9C
 kmr_02_varStash = 0x802455D0; // type:data rom:0x8B5640
 kmr_02_Quizmo_Answers = 0x80245634; // type:data rom:0x8B56A4
 D_80245674_8B56E4 = 0x80245674; // type:data rom:0x8B56E4
-D_80247E30_8B7EA0 = 0x80247E30; // type:data rom:0x8B7EA0
-D_80247E34_8B7EA4 = 0x80247E34; // type:data rom:0x8B7EA4
+kmr_02_ItemChoice_HasSelectedItem = 0x80247E30; // type:data rom:0x8B7EA0
+kmr_02_ItemChoice_SelectedItemID = 0x80247E34; // type:data rom:0x8B7EA4
 D_802480AC_8B811C = 0x802480AC; // type:data rom:0x8B811C
 D_8024E538_8BE5A8 = 0x8024E538; // type:data rom:0x8BE5A8
 D_8025578C_8C57FC = 0x8025578C; // type:data rom:0x8C57FC
@@ -17697,8 +17697,8 @@ nok_01_TransformFoliage = 0x802429A0; // type:func rom:0x9C7D80
 nok_01_varStash = 0x80245F44; // type:data rom:0x9CB324
 nok_01_Quizmo_Answers = 0x80245FA8; // type:data rom:0x9CB388
 D_80245FE8_9CB3C8 = 0x80245FE8; // type:data rom:0x9CB3C8
-D_8024856C_9CD94C = 0x8024856C; // type:data rom:0x9CD94C
-D_80248570_9CD950 = 0x80248570; // type:data rom:0x9CD950
+nok_01_ItemChoice_HasSelectedItem = 0x8024856C; // type:data rom:0x9CD94C
+nok_01_ItemChoice_SelectedItemID = 0x80248570; // type:data rom:0x9CD950
 D_80250810_9D5BF0 = 0x80250810; // type:data rom:0x9D5BF0
 D_80251A90_9D6E70 = 0x80251A90; // type:data rom:0x9D6E70
 D_80251A98_9D6E78 = 0x80251A98; // type:data rom:0x9D6E78
@@ -17791,16 +17791,16 @@ func_802442E0_9DB300 = 0x802442E0; // type:func rom:0x9DB300
 nok_02_foliage_setup_shear_mtx = 0x80244360; // type:func rom:0x9DB380
 nok_02_TransformFoliage = 0x802443D0; // type:func rom:0x9DB3F0
 dup_nok_02_varStash = 0x802453D0; // type:data rom:0x9DC3F0
-D_80245434_9DC454 = 0x80245434; // type:data rom:0x9DC454
-D_80245438_9DC458 = 0x80245438; // type:data rom:0x9DC458
+nok_02_ItemChoice_HasSelectedItem = 0x80245434; // type:data rom:0x9DC454
+nok_02_ItemChoice_SelectedItemID = 0x80245438; // type:data rom:0x9DC458
 nok_02_varStash = 0x802470C8; // type:data rom:0x9DE0E8
 nok_02_Quizmo_Answers = 0x8024712C; // type:data rom:0x9DE14C
 D_8024716C_9DE18C = 0x8024716C; // type:data rom:0x9DE18C
-D_802496F0_9E0710 = 0x802496F0; // type:data rom:0x9E0710
-D_802496F4_9E0714 = 0x802496F4; // type:data rom:0x9E0714
+dup_nok_02_ItemChoice_HasSelectedItem = 0x802496F0; // type:data rom:0x9E0710
+dup_nok_02_ItemChoice_SelectedItemID = 0x802496F4; // type:data rom:0x9E0714
 D_802523B4_9E93D4 = 0x802523B4; // type:data rom:0x9E93D4
-D_80252400_9E9420 = 0x80252400; // type:data rom:0x9E9420
-D_80252404_9E9424 = 0x80252404; // type:data rom:0x9E9424
+dup2_nok_02_ItemChoice_HasSelectedItem = 0x80252400; // type:data rom:0x9E9420
+dup2_nok_02_ItemChoice_SelectedItemID = 0x80252404; // type:data rom:0x9E9424
 nok_02_varStash = 0x80252720; // type:data rom:0x9E9740
 D_80252784_9E97A4 = 0x80252784; // type:data rom:0x9E97A4
 D_80252794_9E97B4 = 0x80252794; // type:data rom:0x9E97B4
@@ -18199,7 +18199,7 @@ func_80241C54_A2BE94 = 0x80241C54; // type:func rom:0xA2BE94
 func_80241D08_A2BF48 = 0x80241D08; // type:func rom:0xA2BF48
 func_80241D7C_A2BFBC = 0x80241D7C; // type:func rom:0xA2BFBC
 func_80241F54_A2C194 = 0x80241F54; // type:func rom:0xA2C194
-update_heroes_start_turn_A2C264 = 0x80242024; // type:func rom:0xA2C264
+func_80242024_A2C264 = 0x80242024; // type:func rom:0xA2C264
 func_802421E0_A2C420 = 0x802421E0; // type:func rom:0xA2C420
 func_802422A0_A2C4E0 = 0x802422A0; // type:func rom:0xA2C4E0
 func_802423D4_A2C614 = 0x802423D4; // type:func rom:0xA2C614
@@ -18364,11 +18364,11 @@ func_8024228C_A3B76C = 0x8024228C; // type:func rom:0xA3B76C
 func_802424CC_A3B9AC = 0x802424CC; // type:func rom:0xA3B9AC
 hos_06_GetItemEmptyCount = 0x80242534; // type:func rom:0xA3BA14
 hos_06_varStash = 0x80242C08; // type:data rom:0xA3C0E8
-D_80242C6C_A3C14C = 0x80242C6C; // type:data rom:0xA3C14C
-D_80242C70_A3C150 = 0x80242C70; // type:data rom:0xA3C150
+hos_06_ItemChoice_HasSelectedItem = 0x80242C6C; // type:data rom:0xA3C14C
+hos_06_ItemChoice_SelectedItemID = 0x80242C70; // type:data rom:0xA3C150
 D_802435EC_A3CACC = 0x802435EC; // type:data rom:0xA3CACC
-D_802445D0_A3DAB0 = 0x802445D0; // type:data rom:0xA3DAB0
-D_802445D4_A3DAB4 = 0x802445D4; // type:data rom:0xA3DAB4
+hos_06_ItemChoice_HasSelectedItem = 0x802445D0; // type:data rom:0xA3DAB0
+hos_06_ItemChoice_SelectedItemID = 0x802445D4; // type:data rom:0xA3DAB4
 hos_06_varStash = 0x8024476C; // type:data rom:0xA3DC4C
 D_802447D0_A3DCB0 = 0x802447D0; // type:data rom:0xA3DCB0
 D_802447D4_A3DCB4 = 0x802447D4; // type:data rom:0xA3DCB4
@@ -18683,19 +18683,19 @@ func_8024027C_A7873C = 0x8024027C; // type:func rom:0xA7873C
 func_802402D0_A78790 = 0x802402D0; // type:func rom:0xA78790
 func_80240308_A787C8 = 0x80240308; // type:func rom:0xA787C8
 func_802403A4_A78864 = 0x802403A4; // type:func rom:0xA78864
-D_80240D98_A79258 = 0x80240D98; // type:data rom:0xA79258
-D_80240D9C_A7925C = 0x80240D9C; // type:data rom:0xA7925C
+kpa_81_ItemChoice_HasSelectedItem = 0x80240D98; // type:data rom:0xA79258
+kpa_81_ItemChoice_SelectedItemID = 0x80240D9C; // type:data rom:0xA7925C
 D_80242000_A7A4C0 = 0x80242000; // type:data rom:0xA7A4C0
 D_80242010_A7A4D0 = 0x80242010; // type:data rom:0xA7A4D0
 func_80240000_A7A500 = 0x80240000; // type:func rom:0xA7A500
 kpa_82_GetNpcCollisionHeight = 0x80240050; // type:func rom:0xA7A550
 kpa_82_AddPlayerHandsOffset = 0x802400AC; // type:func rom:0xA7A5AC
 func_8024027C_A7A77C = 0x8024027C; // type:func rom:0xA7A77C
-func_802402D0_A7A7D0 = 0x802402D0; // type:func rom:0xA7A7D0
+kpa_82_ItemChoice_SaveSelected = 0x802402D0; // type:func rom:0xA7A7D0
 func_80240308_A7A808 = 0x80240308; // type:func rom:0xA7A808
 func_802403A4_A7A8A4 = 0x802403A4; // type:func rom:0xA7A8A4
-D_80240C20_A7B120 = 0x80240C20; // type:data rom:0xA7B120
-D_80240C24_A7B124 = 0x80240C24; // type:data rom:0xA7B124
+kpa_82_ItemChoice_HasSelectedItem = 0x80240C20; // type:data rom:0xA7B120
+kpa_82_ItemChoice_SelectedItemID = 0x80240C24; // type:data rom:0xA7B124
 D_80248F60_A83460 = 0x80248F60; // type:data rom:0xA83460
 D_80248F70_A83470 = 0x80248F70; // type:data rom:0xA83470
 func_80240000_A83490 = 0x80240000; // type:func rom:0xA83490
@@ -18917,8 +18917,8 @@ osr_01_LetterDelivery_CalcLetterPos = 0x802408BC; // type:func rom:0xAB08AC
 osr_01_LetterDelivery_SaveNpcAnim = 0x80240A48; // type:func rom:0xAB0A38
 osr_01_LetterDelivery_RestoreNpcAnim = 0x80240A8C; // type:func rom:0xAB0A7C
 osr_01_varStash = 0x802411B8; // type:data rom:0xAB11A8
-D_8024121C_AB120C = 0x8024121C; // type:data rom:0xAB120C
-D_80241220_AB1210 = 0x80241220; // type:data rom:0xAB1210
+osr_01_ItemChoice_HasSelectedItem = 0x8024121C; // type:data rom:0xAB120C
+osr_01_ItemChoice_SelectedItemID = 0x80241220; // type:data rom:0xAB1210
 D_80242160_AB2150 = 0x80242160; // type:data rom:0xAB2150
 osr_02_SetPlayerSpriteSet2 = 0x80240000; // type:func rom:0xAB2170
 func_80240020_AB2190 = 0x80240020; // type:func rom:0xAB2190
@@ -19094,13 +19094,13 @@ func_8024030C_AF2FAC = 0x8024030C; // type:func rom:0xAF2FAC
 kkj_18_GetNpcCollisionHeight = 0x80240340; // type:func rom:0xAF2FE0
 kkj_18_AddPlayerHandsOffset = 0x8024039C; // type:func rom:0xAF303C
 func_8024056C_AF320C = 0x8024056C; // type:func rom:0xAF320C
-func_802405C0_AF3260 = 0x802405C0; // type:func rom:0xAF3260
+kkj_18_ItemChoice_SaveSelected = 0x802405C0; // type:func rom:0xAF3260
 func_802405F8_AF3298 = 0x802405F8; // type:func rom:0xAF3298
 func_80240694_AF3334 = 0x80240694; // type:func rom:0xAF3334
 func_80240730_AF33D0 = 0x80240730; // type:func rom:0xAF33D0
 func_80240774_AF3414 = 0x80240774; // type:func rom:0xAF3414
-D_80241F10_AF4BB0 = 0x80241F10; // type:data rom:0xAF4BB0
-D_80241F14_AF4BB4 = 0x80241F14; // type:data rom:0xAF4BB4
+kkj_18_ItemChoice_HasSelectedItem = 0x80241F10; // type:data rom:0xAF4BB0
+kkj_18_ItemChoice_SelectedItemID = 0x80241F14; // type:data rom:0xAF4BB4
 D_80244CA0_AF7940 = 0x80244CA0; // type:data rom:0xAF7940
 func_80240000_AF7950 = 0x80240000; // type:func rom:0xAF7950
 func_80240068_AF79B8 = 0x80240068; // type:func rom:0xAF79B8
@@ -19110,7 +19110,7 @@ func_802401FC_AF7B4C = 0x802401FC; // type:func rom:0xAF7B4C
 kkj_19_GetNpcCollisionHeight = 0x802402B0; // type:func rom:0xAF7C00
 kkj_19_AddPlayerHandsOffset = 0x8024030C; // type:func rom:0xAF7C5C
 func_802404DC_AF7E2C = 0x802404DC; // type:func rom:0xAF7E2C
-func_80240530_AF7E80 = 0x80240530; // type:func rom:0xAF7E80
+kkj_19_ItemChoice_SaveSelected = 0x80240530; // type:func rom:0xAF7E80
 func_80240568_AF7EB8 = 0x80240568; // type:func rom:0xAF7EB8
 func_80240604_AF7F54 = 0x80240604; // type:func rom:0xAF7F54
 func_802406A0_AF7FF0 = 0x802406A0; // type:func rom:0xAF7FF0
@@ -19127,8 +19127,8 @@ D_80240E8C_AF87DC = 0x80240E8C; // type:data rom:0xAF87DC
 D_80240E90_AF87E0 = 0x80240E90; // type:data rom:0xAF87E0
 D_80240E94_AF87E4 = 0x80240E94; // type:data rom:0xAF87E4
 D_80240EF0_AF8840 = 0x80240EF0; // type:data rom:0xAF8840
-D_80241B10_AF9460 = 0x80241B10; // type:data rom:0xAF9460
-D_80241B14_AF9464 = 0x80241B14; // type:data rom:0xAF9464
+kkj_19_ItemChoice_HasSelectedItem = 0x80241B10; // type:data rom:0xAF9460
+kkj_19_ItemChoice_SelectedItemID = 0x80241B14; // type:data rom:0xAF9464
 kkj_20_StashVars = 0x80240000; // type:func rom:0xAFDB40
 kkj_20_GetItemName = 0x802400B4; // type:func rom:0xAFDBF4
 kkj_20_SomeItemEntityFunc = 0x80240118; // type:func rom:0xAFDC58
@@ -19329,8 +19329,8 @@ jan_02_SwitchToPartner = 0x802426A8; // type:func rom:0xB2EB18
 jan_02_foliage_setup_shear_mtx = 0x802426E0; // type:func rom:0xB2EB50
 jan_02_TransformFoliage = 0x80242750; // type:func rom:0xB2EBC0
 D_80242BD8_B2F048 = 0x80242BD8; // type:data rom:0xB2F048
-D_80243048_B2F4B8 = 0x80243048; // type:data rom:0xB2F4B8
-D_8024304C_B2F4BC = 0x8024304C; // type:data rom:0xB2F4BC
+jan_02_ItemChoice_HasSelectedItem = 0x80243048; // type:data rom:0xB2F4B8
+jan_02_ItemChoice_SelectedItemID = 0x8024304C; // type:data rom:0xB2F4BC
 jan_02_varStash = 0x802431E4; // type:data rom:0xB2F654
 jan_02_Quizmo_Answers = 0x80243248; // type:data rom:0xB2F6B8
 D_80243288_B2F6F8 = 0x80243288; // type:data rom:0xB2F6F8
@@ -19410,8 +19410,8 @@ func_80242F1C_B37AEC = 0x80242F1C; // type:func rom:0xB37AEC
 func_80242FA0_B37B70 = 0x80242FA0; // type:func rom:0xB37B70
 jan_03_foliage_setup_shear_mtx = 0x80243050; // type:func rom:0xB37C20
 jan_03_TransformFoliage = 0x802430C0; // type:func rom:0xB37C90
-D_80247444_B3C014 = 0x80247444; // type:data rom:0xB3C014
-D_80247448_B3C018 = 0x80247448; // type:data rom:0xB3C018
+jan_03_ItemChoice_HasSelectedItem = 0x80247444; // type:data rom:0xB3C014
+jan_03_ItemChoice_SelectedItemID = 0x80247448; // type:data rom:0xB3C018
 jan_03_varStash = 0x80247764; // type:data rom:0xB3C334
 jan_03_Quizmo_Answers = 0x802477C8; // type:data rom:0xB3C398
 D_80247808_B3C3D8 = 0x80247808; // type:data rom:0xB3C3D8
@@ -19937,8 +19937,8 @@ func_80240F38_BBE0D8 = 0x80240F38; // type:func rom:0xBBE0D8
 func_80241094_BBE234 = 0x80241094; // type:func rom:0xBBE234
 D_80241C58_BBEDF8 = 0x80241C58; // type:data rom:0xBBEDF8
 obk_01_varStash = 0x802440F0; // type:data rom:0xBC1290
-D_80244154_BC12F4 = 0x80244154; // type:data rom:0xBC12F4
-D_80244158_BC12F8 = 0x80244158; // type:data rom:0xBC12F8
+obk_01_ItemChoice_HasSelectedItem = 0x80244154; // type:data rom:0xBC12F4
+obk_01_ItemChoice_SelectedItemID = 0x80244158; // type:data rom:0xBC12F8
 D_80244A54_BC1BF4 = 0x80244A54; // type:data rom:0xBC1BF4
 func_80240000_BC2A90 = 0x80240000; // type:func rom:0xBC2A90
 obk_02_UnkAngleFunc004 = 0x8024000C; // type:func rom:0xBC2A9C
@@ -19960,8 +19960,8 @@ obk_03_LetterDelivery_SaveNpcAnim = 0x80240858; // type:func rom:0xBC4AD8
 obk_03_LetterDelivery_RestoreNpcAnim = 0x8024089C; // type:func rom:0xBC4B1C
 func_802408D0_BC4B50 = 0x802408D0; // type:func rom:0xBC4B50
 obk_03_varStash = 0x80242ECC; // type:data rom:0xBC714C
-D_80242F30_BC71B0 = 0x80242F30; // type:data rom:0xBC71B0
-D_80242F34_BC71B4 = 0x80242F34; // type:data rom:0xBC71B4
+obk_03_ItemChoice_HasSelectedItem = 0x80242F30; // type:data rom:0xBC71B0
+obk_03_ItemChoice_SelectedItemID = 0x80242F34; // type:data rom:0xBC71B4
 D_80243BD0_BC7E50 = 0x80243BD0; // type:data rom:0xBC7E50
 D_80243BD8_BC7E58 = 0x80243BD8; // type:data rom:0xBC7E58
 func_80240000_BC7E60 = 0x80240000; // type:func rom:0xBC7E60
@@ -23648,8 +23648,8 @@ dup_sam_01_StashVars = 0x80241C90; // type:func rom:0xCF9800
 dup_sam_01_GetItemName = 0x80241D44; // type:func rom:0xCF98B4
 sam_01_SomeItemEntityFunc = 0x80241DA8; // type:func rom:0xCF9918
 sam_01_IsItemBadge = 0x80241EF8; // type:func rom:0xCF9A68
-D_802432D0_CFAE40 = 0x802432D0; // type:data rom:0xCFAE40
-D_802432D4_CFAE44 = 0x802432D4; // type:data rom:0xCFAE44
+sam_01_ItemChoice_HasSelectedItem = 0x802432D0; // type:data rom:0xCFAE40
+sam_01_ItemChoice_SelectedItemID = 0x802432D4; // type:data rom:0xCFAE44
 sam_01_varStash = 0x802435F0; // type:data rom:0xCFB160
 sam_01_Quizmo_Answers = 0x802436FC; // type:data rom:0xCFB26C
 D_8024373C_CFB2AC = 0x8024373C; // type:data rom:0xCFB2AC
@@ -23724,8 +23724,8 @@ func_8024053C_D13B0C = 0x8024053C; // type:func rom:0xD13B0C
 func_80240590_D13B60 = 0x80240590; // type:func rom:0xD13B60
 func_802405C8_D13B98 = 0x802405C8; // type:func rom:0xD13B98
 func_80240664_D13C34 = 0x80240664; // type:func rom:0xD13C34
-D_8024387C_D16E4C = 0x8024387C; // type:data rom:0xD16E4C
-D_80243880_D16E50 = 0x80243880; // type:data rom:0xD16E50
+sam_04_ItemChoice_HasSelectedItem = 0x8024387C; // type:data rom:0xD16E4C
+sam_04_ItemChoice_SelectedItemID = 0x80243880; // type:data rom:0xD16E50
 sam_05_MeleeHitbox_30 = 0x80240000; // type:func rom:0xD187E0
 sam_05_MeleeHitbox_31 = 0x8024006C; // type:func rom:0xD1884C
 sam_05_MeleeHitbox_32 = 0x802400DC; // type:func rom:0xD188BC
@@ -23793,8 +23793,8 @@ sam_06_LetterDelivery_RestoreNpcAnim = 0x8024250C; // type:func rom:0xD2239C
 func_80242538_D223C8 = 0x80242538; // type:func rom:0xD223C8
 sam_06_FlyingAI_JumpVels = 0x802441B8; // type:data rom:0xD24048
 sam_06_varStash = 0x802443D0; // type:data rom:0xD24260
-D_80244434_D242C4 = 0x80244434; // type:data rom:0xD242C4
-D_80244438_D242C8 = 0x80244438; // type:data rom:0xD242C8
+sam_06_ItemChoice_HasSelectedItem = 0x80244434; // type:data rom:0xD242C4
+sam_06_ItemChoice_SelectedItemID = 0x80244438; // type:data rom:0xD242C8
 D_8024BE40_D2BCD0 = 0x8024BE40; // type:data rom:0xD2BCD0
 D_8024BE48_D2BCD8 = 0x8024BE48; // type:data rom:0xD2BCD8
 D_8024BE50_D2BCE0 = 0x8024BE50; // type:data rom:0xD2BCE0
@@ -23967,8 +23967,8 @@ func_80241200_D4E240 = 0x80241200; // type:func rom:0xD4E240
 func_80241238_D4E278 = 0x80241238; // type:func rom:0xD4E278
 func_802412D4_D4E314 = 0x802412D4; // type:func rom:0xD4E314
 PostChapter7StatUpdate = 0x80241370; // type:func rom:0xD4E3B0
-D_80241F94_D4EFD4 = 0x80241F94; // type:data rom:0xD4EFD4
-D_80241F98_D4EFD8 = 0x80241F98; // type:data rom:0xD4EFD8
+pra_01_ItemChoice_HasSelectedItem = 0x80241F94; // type:data rom:0xD4EFD4
+pra_01_ItemChoice_SelectedItemID = 0x80241F98; // type:data rom:0xD4EFD8
 pra_02_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD4FFF0
 pra_02_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD50010
 pra_02_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD50044
@@ -23995,8 +23995,8 @@ pra_02_UnkFunc44 = 0x80241478; // type:func rom:0xD51468
 func_802414A8_D51498 = 0x802414A8; // type:func rom:0xD51498
 pra_02_RemovePadlock = 0x80241588; // type:func rom:0xD51578
 dup_pra_02_GetEntityPosition = 0x802415BC; // type:func rom:0xD515AC
-D_80242ACC_D52ABC = 0x80242ACC; // type:data rom:0xD52ABC
-D_80242AD0_D52AC0 = 0x80242AD0; // type:data rom:0xD52AC0
+pra_02_ItemChoice_HasSelectedItem = 0x80242ACC; // type:data rom:0xD52ABC
+pra_02_ItemChoice_SelectedItemID = 0x80242AD0; // type:data rom:0xD52AC0
 pra_03_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD53CB0
 func_80240020_D53CD0 = 0x80240020; // type:func rom:0xD53CD0
 func_802400AC_D53D5C = 0x802400AC; // type:func rom:0xD53D5C
@@ -24067,8 +24067,8 @@ pra_09_PlayBigSmokePuff = 0x80241310; // type:func rom:0xD59BA0
 func_802413A4_D59C34 = 0x802413A4; // type:func rom:0xD59C34
 func_802414F4_D59D84 = 0x802414F4; // type:func rom:0xD59D84
 func_802415F8_D59E88 = 0x802415F8; // type:func rom:0xD59E88
-D_80241D98_D5A628 = 0x80241D98; // type:data rom:0xD5A628
-D_80241D9C_D5A62C = 0x80241D9C; // type:data rom:0xD5A62C
+pra_09_ItemChoice_HasSelectedItem = 0x80241D98; // type:data rom:0xD5A628
+pra_09_ItemChoice_SelectedItemID = 0x80241D9C; // type:data rom:0xD5A62C
 pra_10_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD5F2B0
 pra_10_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD5F2D0
 pra_10_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD5F304
@@ -24151,8 +24151,8 @@ func_802413A4_D65984 = 0x802413A4; // type:func rom:0xD65984
 func_802413D0_D659B0 = 0x802413D0; // type:func rom:0xD659B0
 func_8024140C_D659EC = 0x8024140C; // type:func rom:0xD659EC
 func_802414BC_D65A9C = 0x802414BC; // type:func rom:0xD65A9C
-D_802422CC_D668AC = 0x802422CC; // type:data rom:0xD668AC
-D_802422D0_D668B0 = 0x802422D0; // type:data rom:0xD668B0
+pra_13_ItemChoice_HasSelectedItem = 0x802422CC; // type:data rom:0xD668AC
+pra_13_ItemChoice_SelectedItemID = 0x802422D0; // type:data rom:0xD668B0
 pra_14_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD67D00
 pra_14_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD67D20
 pra_14_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD67D54
@@ -24231,8 +24231,8 @@ func_802416F8_D700A8 = 0x802416F8; // type:func rom:0xD700A8
 func_80241710_D700C0 = 0x80241710; // type:func rom:0xD700C0
 func_8024175C_D7010C = 0x8024175C; // type:func rom:0xD7010C
 func_80241838_D701E8 = 0x80241838; // type:func rom:0xD701E8
-D_8024219C_D70B4C = 0x8024219C; // type:data rom:0xD70B4C
-D_802421A0_D70B50 = 0x802421A0; // type:data rom:0xD70B50
+pra_19_ItemChoice_HasSelectedItem = 0x8024219C; // type:data rom:0xD70B4C
+pra_19_ItemChoice_SelectedItemID = 0x802421A0; // type:data rom:0xD70B50
 pra_20_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD763A0
 pra_20_reflection_unk_resolve_anim = 0x80240020; // type:func rom:0xD763C0
 pra_20_reflection_unk_change_anim_facing = 0x80240054; // type:func rom:0xD763F4
@@ -24334,8 +24334,8 @@ func_80240E70_D7FBD0 = 0x80240E70; // type:func rom:0xD7FBD0
 func_80240F2C_D7FC8C = 0x80240F2C; // type:func rom:0xD7FC8C
 func_80240FD0_D7FD30 = 0x80240FD0; // type:func rom:0xD7FD30
 pra_31_UnkFunc11 = 0x80240FF0; // type:func rom:0xD7FD50
-D_8024119C_D7FEFC = 0x8024119C; // type:data rom:0xD7FEFC
-D_802411A0_D7FF00 = 0x802411A0; // type:data rom:0xD7FF00
+pra_31_ItemChoice_HasSelectedItem = 0x8024119C; // type:data rom:0xD7FEFC
+pra_31_ItemChoice_SelectedItemID = 0x802411A0; // type:data rom:0xD7FF00
 D_802424F0_D81250 = 0x802424F0; // type:data rom:0xD81250
 D_80242514_D81274 = 0x80242514; // type:data rom:0xD81274
 D_80242538_D81298 = 0x80242538; // type:data rom:0xD81298
@@ -24638,8 +24638,8 @@ func_802422A0_DB4560 = 0x802422A0; // type:func rom:0xDB4560
 func_80242328_DB45E8 = 0x80242328; // type:func rom:0xDB45E8
 func_802423C8_DB4688 = 0x802423C8; // type:func rom:0xDB4688
 omo_05_FlyingAI_JumpVels = 0x80242F88; // type:data rom:0xDB5248
-D_80243098_DB5358 = 0x80243098; // type:data rom:0xDB5358
-D_8024309C_DB535C = 0x8024309C; // type:data rom:0xDB535C
+omo_05_ItemChoice_HasSelectedItem = 0x80243098; // type:data rom:0xDB5358
+omo_05_ItemChoice_SelectedItemID = 0x8024309C; // type:data rom:0xDB535C
 D_802452B0_DB7570 = 0x802452B0; // type:data rom:0xDB7570
 D_802452B8_DB7578 = 0x802452B8; // type:data rom:0xDB7578
 D_80245450_DB7710 = 0x80245450; // type:data rom:0xDB7710
@@ -24862,8 +24862,8 @@ omo_13_GetItemName = 0x802412E4; // type:func rom:0xDE3774
 omo_13_SomeItemEntityFunc = 0x80241348; // type:func rom:0xDE37D8
 omo_13_IsItemBadge = 0x80241498; // type:func rom:0xDE3928
 D_80241A78_DE3F08 = 0x80241A78; // type:data rom:0xDE3F08
-D_80241C04_DE4094 = 0x80241C04; // type:data rom:0xDE4094
-D_80241C08_DE4098 = 0x80241C08; // type:data rom:0xDE4098
+omo_13_ItemChoice_HasSelectedItem = 0x80241C04; // type:data rom:0xDE4094
+omo_13_ItemChoice_SelectedItemID = 0x80241C08; // type:data rom:0xDE4098
 omo_13_varStash = 0x80242C70; // type:data rom:0xDE5100
 D_80242EE0_DE5370 = 0x80242EE0; // type:data rom:0xDE5370
 D_80242EE8_DE5378 = 0x80242EE8; // type:data rom:0xDE5378
@@ -25417,8 +25417,8 @@ dead_kzn_17_UnkFunc49 = 0x80242F9C; // type:func rom:0xEA389C
 func_80243054_EA3954 = 0x80243054; // type:func rom:0xEA3954
 dead_kzn_17_UnkFunc51 = 0x802430E4; // type:func rom:0xEA39E4
 dead_kzn_17_varStash = 0x80244154; // type:data rom:0xEA4A54
-D_802441B8_EA4AB8 = 0x802441B8; // type:data rom:0xEA4AB8
-D_802441BC_EA4ABC = 0x802441BC; // type:data rom:0xEA4ABC
+dead_kzn_17_ItemChoice_HasSelectedItem = 0x802441B8; // type:data rom:0xEA4AB8
+dead_kzn_17_ItemChoice_SelectedItemID = 0x802441BC; // type:data rom:0xEA4ABC
 ascii_EA6D70 = 0x80246470; // type:data rom:0xEA6D70
 ascii_EA6D78 = 0x80246478; // type:data rom:0xEA6D78
 D_80246480_EA6D80 = 0x80246480; // type:data rom:0xEA6D80
@@ -25470,8 +25470,8 @@ func_80241BC0_EAA6A0 = 0x80241BC0; // type:func rom:0xEAA6A0
 D_80243AD8_EAC5B8 = 0x80243AD8; // type:data rom:0xEAC5B8
 D_80243BB8_EAC698 = 0x80243BB8; // type:data rom:0xEAC698
 dead_kzn_19_varStash = 0x80243D74; // type:data rom:0xEAC854
-D_80243DD8_EAC8B8 = 0x80243DD8; // type:data rom:0xEAC8B8
-D_80243DDC_EAC8BC = 0x80243DDC; // type:data rom:0xEAC8BC
+dead_kzn_19_ItemChoice_HasSelectedItem = 0x80243DD8; // type:data rom:0xEAC8B8
+dead_kzn_19_ItemChoice_SelectedItemID = 0x80243DDC; // type:data rom:0xEAC8BC
 D_80248370_EB0E50 = 0x80248370; // type:data rom:0xEB0E50
 dead_03_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB0E60
 dead_03_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB0F84
@@ -25480,7 +25480,7 @@ dead_03_GetItemName = 0x802403C4; // type:func rom:0xEB1224
 dead_03_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xEB1288
 dead_03_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xEB12E4
 func_80240654_EB14B4 = 0x80240654; // type:func rom:0xEB14B4
-func_802406A8_EB1508 = 0x802406A8; // type:func rom:0xEB1508
+dead_03_ItemChoice_SaveSelected = 0x802406A8; // type:func rom:0xEB1508
 func_802406E0_EB1540 = 0x802406E0; // type:func rom:0xEB1540
 dead_03_LetterDelivery_Init = 0x8024077C; // type:func rom:0xEB15DC
 dead_03_LetterDelivery_CalcLetterPos = 0x8024086C; // type:func rom:0xEB16CC
@@ -25489,8 +25489,8 @@ dead_03_LetterDelivery_RestoreNpcAnim = 0x80240A3C; // type:func rom:0xEB189C
 func_80240A68_EB18C8 = 0x80240A68; // type:func rom:0xEB18C8
 func_80240A8C_EB18EC = 0x80240A8C; // type:func rom:0xEB18EC
 dead_03_varStash = 0x80241780; // type:data rom:0xEB25E0
-D_802417E4_EB2644 = 0x802417E4; // type:data rom:0xEB2644
-D_802417E8_EB2648 = 0x802417E8; // type:data rom:0xEB2648
+dead_03_ItemChoice_HasSelectedItem = 0x802417E4; // type:data rom:0xEB2644
+dead_03_ItemChoice_SelectedItemID = 0x802417E8; // type:data rom:0xEB2648
 dead_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB5130
 dead_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB5254
 func_8024030C_EB543C = 0x8024030C; // type:func rom:0xEB543C
@@ -25645,8 +25645,8 @@ func_802405C0_EDC5A0 = 0x802405C0; // type:func rom:0xEDC5A0
 func_80240614_EDC5F4 = 0x80240614; // type:func rom:0xEDC5F4
 func_8024064C_EDC62C = 0x8024064C; // type:func rom:0xEDC62C
 dead_flo_12_varStash = 0x802417EC; // type:data rom:0xEDD7CC
-D_80241850_EDD830 = 0x80241850; // type:data rom:0xEDD830
-D_80241854_EDD834 = 0x80241854; // type:data rom:0xEDD834
+dead_flo_12_ItemChoice_HasSelectedItem = 0x80241850; // type:data rom:0xEDD830
+dead_flo_12_ItemChoice_SelectedItemID = 0x80241854; // type:data rom:0xEDD834
 dead_flo_13_func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0
 dead_flo_13_ChangeNpcToPartner = 0x80240040; // type:func rom:0xEDEA00
 dead_flo_13_FlyingAI_WanderInit = 0x802401C4; // type:func rom:0xEDEB84