From a773da8c2d99e768893fcb004b8102acbe2441b2 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Tue, 17 Jan 2023 11:58:57 +0900
Subject: [PATCH] The World (#913)

* wip & cleanup

* progress

* two omo funcs

* cleanup

* func_80243F10_9DAF30

* func_80244078_9DB098

* the rest of ItemChoice_WaitForSelection

* more work

* func_80241DAC_D3C37C
---
 src/16F740.c                                  |  16 +-
 src/19FAF0.c                                  |   2 +-
 src/8a860_len_3f30.c                          | 364 ++++++++----------
 src/a5dd0_len_114e0.c                         |   2 +-
 src/battle/action_cmd/whirlwind.c             |   2 +-
 src/battle/area_kzn2/actor/lava_piranha.c     |   4 +-
 src/battle/item/coconut.c                     |   2 +-
 src/battle/item/dusty_hammer.c                |   2 +-
 src/battle/item/insecticide_herb.c            |   2 +-
 src/battle/item/mystery.c                     |   2 +-
 src/d0a70_len_4fe0.c                          |   2 +-
 src/effects/effect_65.c                       | 176 +++++++++
 src/effects/water_block.c                     |   4 +-
 src/effects/windy_leaves.c                    |   4 +-
 src/encounter.c                               |   2 +-
 src/pause/pause_tabs.c                        |   6 +-
 src/world/area_hos/hos_05/A2AAC0.c            | 111 +++++-
 src/world/area_hos/hos_06/A397F0.c            |   3 +-
 src/world/area_hos/hos_06/A3A230.c            |   5 +-
 src/world/area_jan/jan_02/B2C8A0.c            |   3 +-
 src/world/area_jan/jan_03/B34BD0.c            |   3 +-
 src/world/area_kkj/kkj_13/AD6200.c            |  40 +-
 src/world/area_kkj/kkj_18/AF2FE0.c            |  26 +-
 src/world/area_kkj/kkj_19/AF7C00.c            |  26 +-
 src/world/area_kmr/kmr_02/kmr_02_3_npc.c      |  13 +-
 src/world/area_kmr/kmr_23/kmr_23_2_npc.c      |   4 +-
 src/world/area_nok/nok_01/9C53E0.c            |  25 +-
 src/world/area_nok/nok_02/9D7020.c            |   3 +-
 src/world/area_nok/nok_02/9D7AA0.c            |   3 +-
 src/world/area_nok/nok_02/9DA8F0.c            | 102 ++++-
 src/world/area_omo/omo_02/D9D510.c            | 164 +++++++-
 src/world/area_omo/omo_13/DE2710.c            |  22 +-
 src/world/area_pra/pra_01/D4D060.c            |   3 +-
 src/world/area_pra/pra_02/D50010.c            |   3 +-
 src/world/area_pra/pra_09/D588B0.c            |   3 +-
 src/world/area_pra/pra_13/D64600.c            |   3 +-
 src/world/area_pra/pra_19/D6E9D0.c            |   5 +-
 src/world/area_pra/pra_31/D7ED80.c            |   3 +-
 src/world/area_sam/sam_01/CF7E80.c            |   3 +-
 src/world/area_sam/sam_04/D138E0.c            |   3 +-
 src/world/area_sam/sam_06/D203E0.c            |   3 +-
 src/world/area_sam/sam_11/D3ADA0.c            |  43 ++-
 src/world/common/lava_piranha/part2.inc.c     |   4 +-
 .../todo/ItemChoice_WaitForSelection.inc.c    |  19 +
 src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c |   4 +-
 src/world/script_api/7E0E80.c                 |  45 ++-
 .../data/world/area_hos/hos_06/A3C090.data.s  |   4 +-
 .../data/world/area_hos/hos_06/A3DAB0.data.s  |   2 +-
 .../data/world/area_jan/jan_02/B2F410.data.s  |   2 +-
 .../data/world/area_jan/jan_03/B39530.data.s  |   6 +-
 .../data/world/area_kkj/kkj_18/AF4BB0.data.s  |   4 +-
 .../data/world/area_kkj/kkj_19/AF9460.data.s  |   4 +-
 .../data/world/area_nok/nok_01/9C89E0.data.s  |   4 +-
 .../data/world/area_nok/nok_02/9DB6C0.data.s  |   2 +-
 .../data/world/area_nok/nok_02/9DDE90.data.s  |   4 +-
 .../data/world/area_nok/nok_02/9E9420.data.s  |   4 +-
 .../data/world/area_omo/omo_13/DE3F70.data.s  |   2 +-
 .../data/world/area_pra/pra_01/D4EF50.data.s  |   4 +-
 .../data/world/area_pra/pra_02/D52A80.data.s  |   4 +-
 .../data/world/area_pra/pra_09/D59F80.data.s  |   4 +-
 .../data/world/area_pra/pra_13/D66880.data.s  |   4 +-
 .../data/world/area_pra/pra_19/D70A70.data.s  |   4 +-
 .../data/world/area_pra/pra_31/D7FEC0.data.s  |   4 +-
 .../data/world/area_sam/sam_01/CF9BC0.data.s  |   6 +-
 .../data/world/area_sam/sam_04/D16E20.data.s  |   4 +-
 .../data/world/area_sam/sam_06/D23E50.data.s  |   6 +-
 .../hos_06/A397F0/func_80240654_A39B34.s      |  28 --
 .../hos_06/A3A230/func_80240F7C_A3A45C.s      |  28 --
 .../jan_02/B2C8A0/func_802414EC_B2D95C.s      |  28 --
 .../jan_03/B34BD0/func_802419D8_B365A8.s      |  28 --
 .../kkj_13/AD6200/func_802404E0_AD63B0.s      | 181 ---------
 .../kkj_18/AF2FE0/func_8024056C_AF320C.s      |  28 --
 .../kkj_19/AF7C00/func_802404DC_AF7E2C.s      |  28 --
 .../kmr_02/8B0070/func_8024295C_8B29CC.s      | 163 --------
 .../nok_01/9C53E0/func_80242028_9C7408.s      |  28 --
 .../nok_02/9D7020/func_80240624_9D7644.s      |  28 --
 .../nok_02/9D7AA0/func_80242BD0_9D9BF0.s      |  28 --
 .../nok_02/9DA8F0/func_80243BEC_9DAC0C.s      |  28 --
 .../nok_02/9DA8F0/func_80243F10_9DAF30.s      | 103 -----
 .../nok_02/9DA8F0/func_80244078_9DB098.s      | 120 ------
 .../omo_02/D9D510/func_802402C0_D9D790.s      | 106 -----
 .../omo_02/D9D510/func_8024043C_D9D90C.s      | 349 -----------------
 .../omo_13/DE2710/func_80240F00_DE3390.s      |  28 --
 .../pra_01/D4D060/func_802411AC_D4E1EC.s      |  28 --
 .../pra_02/D50010/func_8024114C_D5113C.s      |  28 --
 .../pra_09/D588B0/func_8024114C_D599DC.s      |  28 --
 .../pra_13/D64600/func_8024114C_D6572C.s      |  28 --
 .../pra_19/D6E9D0/func_8024114C_D6FAFC.s      |  28 --
 .../pra_31/D7ED80/func_8024024C_D7EFAC.s      |  28 --
 .../sam_01/CF7E80/func_8024053C_CF80AC.s      |  28 --
 .../sam_04/D138E0/func_8024053C_D13B0C.s      |  28 --
 .../sam_06/D203E0/func_80241D8C_D21C1C.s      |  28 --
 .../sam_11/D3ADA0/func_80241DAC_D3C37C.s      | 144 -------
 ver/us/symbol_addrs.txt                       |  40 +-
 94 files changed, 910 insertions(+), 2223 deletions(-)
 create mode 100644 src/world/common/todo/ItemChoice_WaitForSelection.inc.c
 delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s
 delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s

diff --git a/src/16F740.c b/src/16F740.c
index c5e6e126bf..7e24bff092 100644
--- a/src/16F740.c
+++ b/src/16F740.c
@@ -2209,7 +2209,7 @@ void btl_state_update_run_away(void) {
                         if (!(enemy->flags & ACTOR_FLAG_NO_DMG_APPLY)) {
                             f32 escapeChance = enemy->actorBlueprint->escapeChance;
 
-                            
+
                             if (enemy->debuff == STATUS_FEAR ||
                                 enemy->debuff == STATUS_DIZZY ||
                                 enemy->debuff == STATUS_PARALYZE ||
@@ -2749,7 +2749,7 @@ void btl_state_update_player_move(void) {
             if (battleStatus->unk_8C != 0) {
                 break;
             }
-            
+
             if (gGameStatusPtr->demoFlags & 1) {
                 btl_set_state(BATTLE_STATE_END_DEMO_BATTLE);
                 break;
@@ -2904,7 +2904,7 @@ void btl_state_update_player_move(void) {
                 player->disableDismissTimer = 0;
                 player->flags |= ACTOR_FLAG_8000000;
                 gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_AWAIT_PLAYER_STATUS_POPUP;
-                
+
             } else {
                 gBattleSubState = BTL_SUBSTATE_PLAYER_MOVE_AWAIT_DONE;
             }
@@ -3013,7 +3013,7 @@ void btl_state_update_end_player_turn(void) {
                 break;
             }
             player->takeTurnScript = NULL;
-            
+
             if (!(gBattleStatus.flags2 & BS_FLAGS2_PEACH_BATTLE) || (gBattleStatus.flags1 & BS_FLAGS1_PLAYER_IN_BACK)) {
                 gBattleSubState = BTL_SUBSTATE_END_PLAYER_TURN_DONE;
             } else {
@@ -3204,7 +3204,7 @@ void btl_state_update_partner_move(void) {
                 break;
             }
             player->handleEventScript = NULL;
-        
+
             enemyFound = FALSE;
             for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
                 enemyActor = battleStatus->enemyActors[i];
@@ -3234,7 +3234,7 @@ void btl_state_update_partner_move(void) {
             if (enemyFound) {
                 break;
             }
-        
+
             for (i = 0; i < ARRAY_COUNT(battleStatus->enemyActors); i++) {
                 enemyActor = battleStatus->enemyActors[i];
                 if (enemyActor != NULL) {
@@ -3461,7 +3461,7 @@ void btl_state_update_next_enemy(void) {
             battleStatus->nextEnemyIndex = i;
 
             skipEnemy = FALSE;
-            
+
             if (enemy->debuff == STATUS_SLEEP) {
                 skipEnemy = TRUE;
             }
@@ -3641,7 +3641,7 @@ void btl_state_update_enemy_move(void) {
             if (waitingForEnemyScript) {
                 break;
             }
-            
+
             if (btl_check_player_defeated()) {
                 return;
             }
diff --git a/src/19FAF0.c b/src/19FAF0.c
index 5574bd0442..b9a66df6aa 100644
--- a/src/19FAF0.c
+++ b/src/19FAF0.c
@@ -1342,7 +1342,7 @@ ApiStatus PlayerRunToGoal(Evt* script, s32 isInitialCall) {
         player->currentPos.z = playerState->goalPos.z;
         return ApiStatus_DONE2;
     }
-    return ApiStatus_BLOCK;;
+    return ApiStatus_BLOCK;
 }
 
 ApiStatus CancelablePlayerRunToGoal(Evt* script, s32 isInitialCall) {
diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c
index a75f56f42f..cb8a458b3d 100644
--- a/src/8a860_len_3f30.c
+++ b/src/8a860_len_3f30.c
@@ -1002,107 +1002,65 @@ s32 popup_menu_update(void) {
     return 0;
 }
 
-#ifdef WIP
+#ifdef NON_MATCHING
 void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 width, s32 height, s32 opacity, s32 darkening) {
-    s32 x;
-    s32 xOffset;
-    s32 sp28;
-    Gfx* temp_a3;
-    Gfx* var_a1;
-    Gfx* var_a1_6;
-    f32 temp_f2;
-    s16 temp_s1;
-    s16 var_t0;
-
-    s32 temp_a0;
-    s32 temp_a0_3;
-
-    s32 temp_s1_2;
-    s32 temp_s3;
-    s32 temp_s3_2;
-    s32 temp_s3_3;
-    s32 temp_t1;
-
-    s32 temp_v1;
-    s32 temp_v1_5;
-
+    s32 x, y; // sp20, s1
+    s32 y1;
+    s32 xOffset; // sp24
+    s32 sp28; // sp28
     s32 var_a0;
-    s32 var_a1_3;
-    s32 var_a1_5;
-
-    s32 var_s1;
-    s32 var_s1_2;
-    s32 var_s1_3;
-    s32 var_s1_4;
-    s32 var_s1_5;
-
     s32 i;
-
     s32 j;
-    s32 var_s6;
-    s32 var_s7;
-
-    s32 var_t0_2;
-
     s32 id;
-
     s32 s0;
+    s32 a0;
+    s32 v0;
 
-    s32 tmp;
-    s32 tmp2;
-
-    if (D_8010D640 != 0xA) {
-        if (D_8010D640 < 0xB) {
-            if (D_8010D640 < 0) {
-                if (D_8010D640 < -2) {
-                    if (D_8010D640 < -5) {
-                        if (D_8010D640 >= -8) {
-                            goto block_14;
-                        }
-                    }
-                } else {
-                    goto block_14;
-                }
-            } else {
-                if (D_8010D640 != 1) {
-                    return;
-                }
-                goto block_14;
-            }
-        } else {
-            if (D_8010D640 < 0x20) {
-                if ((D_8010D640 < 0x1E) && (D_8010D640 != 0x14)) {
-                    return;
-                }
-                goto block_14;
-            }
-            if (D_8010D640 < 0x6A) {
-                if (D_8010D640 >= 0x64) {
-                    goto block_14;
-                }
-            }
-        }
+    switch (D_8010D640) {
+        case 10:
+        case -1:
+        case -2:
+        case -6:
+        case -7:
+        case -8:
+        case 1:
+        case 30:
+        case 31:
+        case 20:
+        case 100:
+        case 101:
+        case 102:
+        case 103:
+        case 104:
+        case 105:
+            break;
+        default:
+            return;
     }
-    return;
 
-block_14:
-    temp_s1 = D_8010D654 * -0xD;
-    var_a0 = temp_s1 - D_8010D658;
     baseX += 2;
     baseY += 0xF;
+    y = -D_8010D654 * 13;
+    y1 = D_8010D658;
+    var_a0 = y - y1;
+
     if (var_a0 < 130) {
-        var_a0 = (s32) (var_a0 * 0.5);
+        var_a0 *= 0.5;
     } else {
-        var_a0 = (var_a0 * 100) / 150;
+        var_a0 = var_a0 * 100 / 150;
     }
-    var_t0 = D_8010D658 + var_a0;
-    if (var_a0 == 0) {
-        var_t0 = temp_s1;
+    if (var_a0 != 0) {
+        y1 += var_a0;
+    } else {
+        y1 = y;
     }
-    D_8010D658 = var_t0;
-    sp28 = -var_t0 / 13;
+    D_8010D658 = y1;
+    sp28 = -D_8010D658 / 13;
+
+
     x = baseX;
-    tmp2 = (D_8010D656 * 0xD) + 4;
+    y = baseY;
+    y1 = y + D_8010D656 * 13 + 4;
     switch (gPopupMenu->popupType) {
         case 0:
         case 3:
@@ -1115,53 +1073,48 @@ block_14:
         case 11:
         case 12:
         case 13:
-            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, baseY, x + 0x70, baseY + tmp2);
+            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 0x70, y1);
             break;
         case 1:
         case 4:
-            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, baseY, x + 0x5A, baseY + tmp2);
+            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 0x5A, y1);
             break;
         case 2:
-            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, baseY, x + 0xA0, baseY + tmp2);
+            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 0xA0, y1);
             break;
     }
-    temp_v1 = baseY + D_8010D658;
-    var_s1 = temp_v1 + 8;
+
+    y = baseY + D_8010D658 + 8;
     if (gPopupMenu->popupType == 2) {
-        var_s1 = temp_v1 + 0x15;
+        y = baseY + D_8010D658 + 0x15;
     }
     id = D_8010D65C;
-    hud_element_set_render_pos(id, baseX + 0x49, var_s1 - 3);
+    hud_element_set_render_pos(id, baseX + 0x49, y - 3);
     hud_element_set_alpha(id, D_8010D650);
     if (D_8010D68F < gPopupMenu->numEntries) {
         hud_element_draw_without_clipping(id);
     }
-    var_s1_2 = baseY + 2;
     x = baseX;
-    var_t0_2 = var_s1_2 + (D_8010D656 * 0xD);
+    y = baseY + 2;
+    y1 = y + D_8010D656 * 13;
     if ((gPopupMenu->popupType == 2) && (D_8010D654 < 2)) {
-        var_s1_2 = baseY;
-        var_t0_2 += 1;
+        y = baseY;
+        y1++;
     }
-    temp_a3 = gMasterGfxPos;
-    temp_a3->words.w0 = (((s32) ((f32) x * 4.0f) & 0xFFF) << 0xC) | (((s32) ((f32) var_s1_2 * 4.0f) & 0xFFF) | 0xED000000);
+    gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + D_801098BC[gPopupMenu->popupType], y1);
     xOffset = 0;
-    temp_f2 = (f32) (x + D_801098BC[gPopupMenu->popupType]) * 4.0f;
-    gMasterGfxPos += 8;
-    temp_t1 = baseY + D_8010D658;
     x = baseX + 0x20;
-    temp_a3->words.w1 = (((s32) temp_f2 & 0xFFF) << 0xC) | ((s32) ((f32) var_t0_2 * 4.0f) & 0xFFF);
-    var_s1_3 = temp_t1 + 2;
+    y = baseY + D_8010D658 + 2;
     if (gPopupMenu->popupType == 2) {
-        var_s1_3 = temp_t1;
+        y = baseY + D_8010D658;
         xOffset = 2;
     }
 
     for (i = 0; i < gPopupMenu->numEntries; i++) {
-        if ((i < (sp28 - 1)) || ((sp28 + D_8010D656) < i)) {
-            var_s1_3 += 0xD;
+        if (sp28 - 1 > i || sp28 + D_8010D656 < i) {
+            y += 0xD;
             if (i == 0) {
-                var_s1_3 += xOffset;
+                y += xOffset;
             }
         } else {
             s0 = D_8010D690;
@@ -1181,38 +1134,41 @@ block_14:
                 case 9:
                 case 12:
                 case 13:
-                    draw_msg(gPopupMenu->nameMsg[i], x, var_s1_3, D_8010D650, s0, 1);
+                    draw_msg(gPopupMenu->nameMsg[i], x, y, D_8010D650, s0, 1);
                     break;
                 case 1:
                 case 4:
-                    draw_msg(gPopupMenu->nameMsg[i], x, var_s1_3, D_8010D650, s0, 1);
+                    draw_msg(gPopupMenu->nameMsg[i], x, y, D_8010D650, s0, 1);
                     break;
                 case 8:
                     if (gPopupMenu->enabled[i] == 2) {
-
+                        s0 = 34;
                     }
-                    draw_msg(gPopupMenu->nameMsg[i], x, var_s1_3, D_8010D650, s0, 1);
+                    draw_msg(gPopupMenu->nameMsg[i], x, y, D_8010D650, s0, 1);
                     break;
                 case 10:
                     if (gPopupMenu->value[i] != 0) {
-
+                        s0 = 11;
+                    } else {
+                        s0 = 10;
                     }
                     set_message_value(gPopupMenu->userIndex[i] + 1, 0);
-                    draw_msg(MSG_Menus_00CD, x + 8, var_s1_3, D_8010D650, s0, 1);
+                    draw_msg(MSG_Menus_00CD, x + 8, y, D_8010D650, s0, 1);
                     break;
                 case 11:
                     if (gPopupMenu->value[i] != 0) {
-
+                        s0 = 11;
+                    } else {
+                        s0 = 10;
                     }
-                    draw_msg(gPopupMenu->nameMsg[i], x, var_s1_3, D_8010D650, s0, 1);
+                    a0 = gPopupMenu->nameMsg[i];
+                    draw_msg(a0, x, y, D_8010D650, s0, 1);
                     break;
             }
 
             switch (gPopupMenu->popupType) {
                 case 1:
                 case 4:
-                    var_s7 = 0x5B;
-                    var_s6 = 0x55;
                     for (j = 0; j < 2; j++) {
                         id = D_8010D668;
                         if (gPopupMenu->enabled[i]) {
@@ -1221,43 +1177,34 @@ block_14:
                             hud_element_set_script(id, D_80109898[j]);
                         }
                         if (gPopupMenu->popupType == 1) {
-                            hud_element_set_render_pos(id, x + var_s6, var_s1_3 + 0xA);
+                            hud_element_set_render_pos(id, x + 0x55 + j * 13, y + 0xA);
                         } else {
-                            hud_element_set_render_pos(id, x + var_s7, var_s1_3 + 0xA);
+                            hud_element_set_render_pos(id, x + 0x5B + j * 13, y + 0xA);
                         }
                         if (j < gPopupMenu->value[i]) {
                             hud_element_draw_next(id);
                         }
-                        var_s7 += 0xD;
-                        var_s6 += 0xD;
                     }
-                    var_s1_3 += 0xD;
                     break;
                 case 3:
-                    var_a1_3 = x + 0x73;
-        block_79:
-                    draw_number(gPopupMenu->value[i], var_a1_3, var_s1_3, 1, 0, D_8010D650, 0); // two zeros at the end
-                    var_s1_3 += 0xD;
+                    draw_number(gPopupMenu->value[i], x + 0x73, y, 1, s0, D_8010D650, 3);
                     break;
                 case 5:
-                    var_a1_3 = x + 0x79;
-                    goto block_79;
-                default:
-                    var_s1_3 += 0xD;
+                    draw_number(gPopupMenu->value[i], x + 0x79, y, 1, s0, D_8010D650, 3);
+                    break;
             }
-
+            y += 0xD;
             if (i == 0) {
-                var_s1_3 += xOffset;
+                y += xOffset;
             }
         }
     }
 
-    xOffset = 0;
-    temp_a0_3 = baseY + D_8010D658;
     x = baseX + 0x18;
-    var_s1_4 = temp_a0_3 + 8;
+    y = baseY + D_8010D658 + 8;
+    xOffset = 0;
     if (gPopupMenu->popupType == 2) {
-        var_s1_4 = temp_a0_3 + 6;
+        y = baseY + D_8010D658 + 6;
         xOffset = 2;
     }
 
@@ -1274,96 +1221,85 @@ block_14:
         case 9:
         case 12:
         case 13:
-            i = 0;
-            if (gPopupMenu->numEntries > 0) {
-                temp_s3 = sp28 - 1;
-                do {
-                    if ((temp_s3 > i) || ((sp28 + D_8010D656) < i)) {
-                        var_s1_4 += 0xD;
-                        if (i == 0) {
-                            var_s1_4 += xOffset;
-                        }
-                    } else {
-                        id = D_8010D678;
-                        hud_element_set_script(id, gPopupMenu->ptrIcon[i]);
-                        hud_element_set_render_pos(id, x, var_s1_4);
-                        var_s1_4 += 0xD;
-                        hud_element_set_alpha(id, D_8010D650);
-                        hud_element_set_scale(id, 0.45f);
-                        hud_element_draw_without_clipping(id);
-                        if (i == 0) {
-                            var_s1_4 += xOffset;
-                        }
+            for (i = 0; i < gPopupMenu->numEntries; i++) {
+                if (sp28 - 1 > i || sp28 + D_8010D656 < i) {
+                    y += 0xD;
+                    if (i == 0) {
+                        y += xOffset;
                     }
-                    i += 1;
-                } while (i < gPopupMenu->numEntries);
+                } else {
+                    id = D_8010D678;
+                    hud_element_set_script(id, gPopupMenu->ptrIcon[i]);
+                    hud_element_set_render_pos(id, x, y);
+                    hud_element_set_alpha(id, D_8010D650);
+                    hud_element_set_scale(id, 0.45f);
+                    hud_element_draw_without_clipping(id);
+                    y += 0xD;
+                    if (i == 0) {
+                        y += xOffset;
+                    }
+                }
             }
             break;
         case 10:
-            i = 0;
-            if (gPopupMenu->numEntries > 0) {
-                temp_s3_2 = sp28 - 1;
-                do {
-                    if ((temp_s3_2 > i) || ((sp28 + D_8010D656) < i)) {
-                        var_s1_4 += 0xD;
-                        if (i == 0) {
-                            var_s1_4 += xOffset;
-                        }
-                    } else {
-                        id = D_8010D678;
-                        hud_element_set_script(id, gPopupMenu->ptrIcon[i]);
-                        hud_element_set_render_pos(id, x, var_s1_4);
-                        var_s1_4 += 0xD;
-                        hud_element_set_alpha(id, D_8010D650);
-                        hud_element_set_scale(id, 0.45f);
-                        hud_element_draw_without_clipping(id);
-                        if (i == 0) {
-                            var_s1_4 += xOffset;
-                        }
+            for (i = 0; i < gPopupMenu->numEntries; i++) {
+                if (sp28 - 1 > i || sp28 + D_8010D656 < i) {
+                    y += 0xD;
+                    if (i == 0) {
+                        y += xOffset;
                     }
-                    i += 1;
-                } while (i < gPopupMenu->numEntries);
+                } else {
+                    id = D_8010D678;
+                    hud_element_set_script(id, gPopupMenu->ptrIcon[i]);
+                    hud_element_set_render_pos(id, x, y);
+                    hud_element_set_alpha(id, D_8010D650);
+                    hud_element_set_scale(id, 0.45f);
+                    hud_element_draw_without_clipping(id);
+                    y += 0xD;
+                    if (i == 0) {
+                        y += xOffset;
+                    }
+                }
             }
             break;
         case 11:
-            i = 0;
-            if (gPopupMenu->numEntries > 0) {
-                temp_s3_3 = sp28 - 1;
-                do {
-                    if ((temp_s3_3 > i) || ((sp28 + D_8010D656) < i)) {
-                        var_s1_4 += 0xD;
-                        if (i == 0) {
-                            var_s1_4 += xOffset;
-                        }
-                    } else {
-                        id = D_8010D678;
-                        hud_element_set_script(id, gPopupMenu->ptrIcon[i]);
-                        hud_element_set_render_pos(id, x, var_s1_4);
-                        var_s1_4 += 0xD;
-                        hud_element_set_alpha(id, D_8010D650);
-                        hud_element_set_scale(id, 0.45f);
-                        hud_element_draw_without_clipping(id);
-                        if (i == 0) {
-                            var_s1_4 += xOffset;
-                        }
+            for (i = 0; i < gPopupMenu->numEntries; i++) {
+                if (sp28 - 1 > i || sp28 + D_8010D656 < i) {
+                    y += 0xD;
+                    if (i == 0) {
+                        y += xOffset;
                     }
-                    i += 1;
-                } while (i < gPopupMenu->numEntries);
+                } else {
+                    id = D_8010D678;
+                    hud_element_set_script(id, gPopupMenu->ptrIcon[i]);
+                    hud_element_set_render_pos(id, x, y);
+                    hud_element_set_alpha(id, D_8010D650);
+                    hud_element_set_scale(id, 0.45f);
+                    hud_element_draw_without_clipping(id);
+                    y += 0xD;
+                    if (i == 0) {
+                        y += xOffset;
+                    }
+                }
             }
             break;
     }
+
     id = D_8010D66C;
-    var_s1_5 = baseY + (((D_8010D648 - D_8010D654) * 0xD) + 9);
     x = baseX + 8;
-    if ((gPopupMenu->popupType == 2) && (D_8010D648 == 0)) {
-        var_s1_5 -= 2;
+    v0 = (D_8010D648 - D_8010D654) * 0xD + 9;
+    y = baseY + v0;
+
+    if (gPopupMenu->popupType == 2 && D_8010D648 == 0) {
+        y -= 2;
     }
-    hud_element_set_render_pos(id, x, var_s1_5);
+    hud_element_set_render_pos(id, x, y);
     hud_element_set_alpha(id, D_8010D650);
     hud_element_draw_without_clipping(id);
-    tmp = (D_8010D656 * 13) + 0x10;
-    temp_s1_2 = baseY - 6;
+
     x = baseX;
+    y = baseY - 6;
+    y1 = y + (D_8010D656 * 13) + 0x10;
     switch (gPopupMenu->popupType) {
         case 0:
         case 2:
@@ -1377,11 +1313,11 @@ block_14:
         case 11:
         case 12:
         case 13:
-            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, temp_s1_2, x + 0x70, temp_s1_2 + tmp);
+            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 0x70, y1);
             break;
         case 1:
         case 4:
-            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, temp_s1_2, x + 0x64, temp_s1_2 + tmp);
+            gDPSetScissor(gMasterGfxPos++, G_SC_NON_INTERLACE, x, y, x + 0x64, y1);
             break;
     }
 
@@ -1422,7 +1358,8 @@ block_14:
     if (D_8010D654 > 0) {
         id = D_8010D670;
         x = baseX + xOffset;
-        hud_element_set_render_pos(id, x + 35, baseY - 1);
+        y = baseY;
+        hud_element_set_render_pos(id, x + 35, y - 1);
         hud_element_set_alpha(id, D_8010D650);
         hud_element_draw_without_clipping(id);
     }
@@ -1430,11 +1367,12 @@ block_14:
     if (D_8010D655 < gPopupMenu->numEntries) {
         id = D_8010D674;
         x = baseX + xOffset;
-        hud_element_set_render_pos(id, x + 35, baseY + (D_8010D68F * 0xD) + 5);
+        y = baseY + D_8010D68F * 0xD;
+        hud_element_set_render_pos(id, x + 35, y + 5);
         hud_element_set_alpha(id, D_8010D650);
         hud_element_draw_without_clipping(id);
     }
-}
+
 #else
 INCLUDE_ASM(s32, "8a860_len_3f30", popup_menu_draw_menu_contents);
 #endif
diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c
index ade9ad0459..c7d949e537 100644
--- a/src/a5dd0_len_114e0.c
+++ b/src/a5dd0_len_114e0.c
@@ -2035,7 +2035,7 @@ s32 is_entity_data_loaded(Entity* entity, EntityBlueprint* blueprint, s32* loade
                 if (bp->flags & ENTITY_FLAG_HAS_ANIMATED_MODEL) {
                     s32 size = (bpDmaList[0].end - bpDmaList[0].start) >> 2;
                     *loadedEnd = *loadedStart = *loadedStart + size;
-                    size = (bpDmaList[1].end - bpDmaList[1].start) >> 2;;
+                    size = (bpDmaList[1].end - bpDmaList[1].start) >> 2;
                     *loadedStart = *loadedStart + size;
                 } else {
                     *loadedStart += (bp->dma.end - bp->dma.start) >> 2;
diff --git a/src/battle/action_cmd/whirlwind.c b/src/battle/action_cmd/whirlwind.c
index 0f3762a2ac..724633fccc 100644
--- a/src/battle/action_cmd/whirlwind.c
+++ b/src/battle/action_cmd/whirlwind.c
@@ -36,7 +36,7 @@ HudScript HES_Whirlwind3 = HES_TEMPLATE_CI_ENUM_SIZE(battle_action_cmd_whirlwind
 
 HudScript HES_Whirlwind4 = HES_TEMPLATE_CI_ENUM_SIZE(battle_action_cmd_whirlwind_4, 24, 24);
 
-HudScript HES_Whirlwind5 = HES_TEMPLATE_CI_ENUM_SIZE(battle_action_cmd_whirlwind_5, 24, 24);;
+HudScript HES_Whirlwind5 = HES_TEMPLATE_CI_ENUM_SIZE(battle_action_cmd_whirlwind_5, 24, 24);
 
 HudScript HES_Whirlwind6 = HES_TEMPLATE_CI_ENUM_SIZE(battle_action_cmd_whirlwind_6, 24, 24);
 
diff --git a/src/battle/area_kzn2/actor/lava_piranha.c b/src/battle/area_kzn2/actor/lava_piranha.c
index 098263eaf1..aafe6dc26c 100644
--- a/src/battle/area_kzn2/actor/lava_piranha.c
+++ b/src/battle/area_kzn2/actor/lava_piranha.c
@@ -482,7 +482,7 @@ void func_8021835C_59EA3C(void* data) {
             vtx->tc[0] = j * 0x140;
             vtx->tc[1] = 0;
             vtx->cn[0] = j * 50;
-            vtx->cn[1] = j * 120;;
+            vtx->cn[1] = j * 120;
             vtx->cn[2] = j * 30;
             vtx++;
 
@@ -492,7 +492,7 @@ void func_8021835C_59EA3C(void* data) {
             vtx->tc[0] = j * 0x140;
             vtx->tc[1] = 0x400;
             vtx->cn[0] = j * 50;
-            vtx->cn[1] = j * 120;;
+            vtx->cn[1] = j * 120;
             vtx->cn[2] = j * 30;
             vtx++;
         }
diff --git a/src/battle/item/coconut.c b/src/battle/item/coconut.c
index 6568c387db..7a2ed19e72 100644
--- a/src/battle/item/coconut.c
+++ b/src/battle/item/coconut.c
@@ -42,7 +42,7 @@ Gfx N(displayList)[] = {
     gsSPEndDisplayList(),
 };
 
-EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST);;
+EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST);
 
 EvtScript N(main) = {
     EVT_SET_CONST(LVarA, ITEM_COCONUT)
diff --git a/src/battle/item/dusty_hammer.c b/src/battle/item/dusty_hammer.c
index 79fba29afc..a86c4e7199 100644
--- a/src/battle/item/dusty_hammer.c
+++ b/src/battle/item/dusty_hammer.c
@@ -41,7 +41,7 @@ Gfx N(displayList)[] = {
     gsSPEndDisplayList(),
 };
 
-EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST);;
+EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST);
 
 EvtScript N(main) = {
     EVT_SET_CONST(LVarA, ITEM_DUSTY_HAMMER)
diff --git a/src/battle/item/insecticide_herb.c b/src/battle/item/insecticide_herb.c
index 6ff534a694..3acf51a860 100644
--- a/src/battle/item/insecticide_herb.c
+++ b/src/battle/item/insecticide_herb.c
@@ -85,7 +85,7 @@ Gfx N(displayList)[] = {
     gsSPEndDisplayList(),
 };
 
-EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST);;
+EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST);
 
 
 EvtScript N(main) = {
diff --git a/src/battle/item/mystery.c b/src/battle/item/mystery.c
index 7f66767057..fd26f02b0b 100644
--- a/src/battle/item/mystery.c
+++ b/src/battle/item/mystery.c
@@ -207,7 +207,7 @@ Gfx N(displayList)[] = {
     gsSPEndDisplayList(),
 };
 
-EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST);;
+EntityModelScript N(modelCommandList) = STANDARD_ENTITY_MODEL_SCRIPT(N(displayList), RENDER_MODE_ALPHATEST);
 
 s32 N(D_802A227C_72D82C)[8] = {
     ITEM_MUSHROOM,
diff --git a/src/d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c
index 9fc77d3516..b175e90836 100644
--- a/src/d0a70_len_4fe0.c
+++ b/src/d0a70_len_4fe0.c
@@ -63,7 +63,7 @@ typedef struct UnkFoldStruct {
 
 typedef struct PackedVtx {
     /* 0x00 */ s16 ob[3];
-    /* 0x06 */ u8 tc[2];;
+    /* 0x06 */ u8 tc[2];
     /* 0x08 */ s8 cn[3];
     /* 0x0B */ char unk_0B;
 } PackedVtx; // size = 0x0C
diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c
index 41c65f70a1..b6ac90902a 100644
--- a/src/effects/effect_65.c
+++ b/src/effects/effect_65.c
@@ -203,4 +203,180 @@ void fx_65_render(EffectInstance* effect) {
     retTask->renderMode |= RENDER_TASK_FLAG_2;
 }
 
+// floats and more
+#ifdef NON_MATCHING
+void fx_65_appendGfx(void* effect) {
+    Effect65FXData* data = ((EffectInstance*)effect)->data.unk_65;
+    Matrix4f sp10;
+    s32 sp50;
+    s32 sp54;
+    f32 sp58;
+    Gfx* vtxBuffer;
+    s32 sp60;
+    s32 sp64;
+    s32 sp68;
+    s32 idx;
+    s32 idx2;
+    f32 posX, posY, posZ;
+    f32 deltaX, deltaY;
+    Vtx_t* vtx;
+    s32 i;
+
+    f32 temp_f22;
+    f32 temp_f2;
+    f32 var_f12;
+    f32 var_f20;
+    f32 var_f30;
+    s32 temp_fp;
+    s32 temp_s1;
+    s32 temp_s5;
+    s32 temp_s5_2;
+    s32 temp_v0;
+    s32 temp_v1_2;
+    s32 var_fp;
+    s32 vtxG;
+    s32 var_s1;
+    s32 vtxB;
+    s32 vtxR;
+    s32 vtxA;
+
+    sp50 = data->unk_14;
+    temp_s5 = data->unk_24;
+    sp54 = data->unk_00;
+    sp58 = data->unk_34;
+
+    gDPPipeSync(gMasterGfxPos++);
+    gSPSegment(gMasterGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data));
+
+    shim_guTranslateF(sp10, 0.0f, 0.0f, 0.0f);
+    shim_guMtxF2L(sp10, &gDisplayContext->matrixStack[gMatrixListPos]);
+
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(gMasterGfxPos++, D_E00CACB0[sp54]);
+
+    if (sp54 >= 2) {
+        gDPSetCombineLERP(gMasterGfxPos++, SHADE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, SHADE, 0, 0, 0, 0, COMBINED, COMBINED, 0, PRIMITIVE, 0);
+    }
+    var_fp = 0;
+    sp60 = -1;
+    sp64 = (sp50 & 0x3F) << 5;
+    gDPSetPrimColor(gMasterGfxPos++, 0, 0, data->unk_18, data->unk_1C, data->unk_20, temp_s5);
+    gDPSetEnvColor(gMasterGfxPos++, data->unk_28, data->unk_2C, data->unk_30, 0);
+    gSPBranchList(gMasterGfxPos, &gMasterGfxPos[121]);
+
+    vtxBuffer = (Vtx_t*) (gMasterGfxPos + 1);
+    gMasterGfxPos = &gMasterGfxPos[121];
+
+    for (i = 1; i < 30; i++) {
+        if (data->unk_230[(data->unk_2A8 + i) % 30] != 0) {
+            var_fp += 1;
+        }
+    }
+
+    temp_fp = var_fp - 1;
+    i = 0;
+    if (temp_fp > 0) {
+        sp68 = 0;
+
+        for (; i < 30; i++) {
+            Vtx_t* vtx = &vtxBuffer[i * 2];
+
+            idx2 = (data->unk_2A8 + (i + 1)) % 30;
+            vtxA = shim_sin_deg((f32) (sp68 / temp_fp)) * 255.0f;
+            if (vtxA > 200) {
+                vtxA = 200;
+            }
+            if (data->unk_230[idx2] != 0) {
+                if (sp60 == -1) {
+                    idx = idx2 + 1;
+                    if (idx >= 30) {
+                        idx = 0;
+                    }
+                    sp60 = i;
+                    var_f30 = -shim_atan2(data->unk_C8[idx], -data->unk_50[idx], data->unk_C8[idx2], -data->unk_50[idx2]);
+                } else {
+                    idx = idx2 + 1;
+                    if (i != 0x1D) {
+                        var_s1 = idx2 - 1;
+                        if (idx >= 30) {
+                            idx = 0;
+                        }
+                        if (var_s1 < 0) {
+                            var_s1 = 29;
+                        }
+                        var_f20 = -shim_atan2(data->unk_C8[idx], -data->unk_50[idx], data->unk_C8[idx2], -data->unk_50[idx2]);
+                        var_f12 = -shim_atan2(data->unk_C8[idx2], -data->unk_50[idx2], data->unk_C8[var_s1], -data->unk_50[var_s1]);
+                        temp_f2 = var_f12 - var_f20;
+                        if (temp_f2 > 180.0f) {
+                            var_f20 += 360.0f;
+                        } else if (temp_f2 < -180.0f) {
+                            var_f12 += 360.0f;
+                        }
+                        var_f30 = (f64) (var_f20 + var_f12) * 0.5;
+                    }
+                }
+                temp_v1_2 = data->unk_1B8[idx2];
+                posX = data->unk_50[idx2];
+                posY = data->unk_C8[idx2];
+                posZ = data->unk_140[idx2];
+                temp_s1 = sp50 - temp_v1_2;
+                //temp_f22 = ((shim_sin_deg(((sp50 - (temp_v1_2 * 80)) * 4)) * 3.0f) + 16.0f + temp_s1) * sp58;
+                temp_f22 = ((shim_sin_deg((sp50 - (temp_v1_2 * 80)) * 4) * 3.0f) + 16.0f) + temp_s1;
+                temp_f22 = temp_f22 * sp58;
+                temp_s5_2 = (data->unk_2AC[idx2] * 24.0f) + sp64;
+
+                do {
+                    vtxR = 0xFF;
+                    vtxG = 0xFF;
+                    vtxB = 0xFF - (temp_s1 * 100);
+                    if (vtxB < 0) {
+                        vtxG = ((f32) vtxB * 0.8) + 255.0;
+                        vtxB = 0;
+                        if (vtxG < 0) {
+                            vtxR = ((f32) vtxG * 0.4) + 255.0;
+                            vtxG = 0;
+                            if (vtxR < 0) {
+                                vtxR = 0;
+                            }
+                        }
+                    }
+                } while (0);
+
+                deltaX = temp_f22 * shim_sin_deg(var_f30);
+                deltaY = temp_f22 * shim_cos_deg(var_f30);
+                sp68 += 180;
+
+                vtx->ob[0] = posX + deltaX;
+                vtx->ob[1] = posY + deltaY;
+                vtx->ob[2] = posZ + 0.0f;
+                vtx->tc[0] = temp_s5_2;
+                vtx->tc[1] = 0x400;
+                vtx->cn[0] = vtxR;
+                vtx->cn[1] = vtxG;
+                vtx->cn[2] = vtxB;
+                vtx->cn[3] = vtxA;
+                vtx++;
+
+                vtx->ob[0] = posX - deltaX;
+                vtx->ob[1] = posY - deltaY;
+                vtx->ob[2] = posZ + 0.0f;
+                vtx->tc[0] = temp_s5_2;
+                vtx->tc[1] = 0;
+                vtx->cn[0] = vtxR;
+                vtx->cn[1] = vtxG;
+                vtx->cn[2] = vtxB;
+                vtx->cn[3] = vtxA;
+                vtx++;
+            }
+        }
+
+        for (i = sp60; i < 29; i++) {
+            gSPVertex(gMasterGfxPos++, &vtxBuffer[i * 4], 4, 0);
+            gSP2Triangles(gMasterGfxPos++, 0, 2, 1, 0, 1, 2, 3, 0);
+        }
+    }
+    gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW);
+}
+#else
 INCLUDE_ASM(s32, "effects/effect_65", fx_65_appendGfx);
+#endif
diff --git a/src/effects/water_block.c b/src/effects/water_block.c
index 59e3b41947..8b542b6b64 100644
--- a/src/effects/water_block.c
+++ b/src/effects/water_block.c
@@ -157,8 +157,8 @@ void water_block_update(EffectInstance* effect) {
     temp_s0 = data->unk_14;
     if (temp_a0 == 0) {
         if (temp_v1_3 < 16) {
-            data->unk_24 = temp_v1_3 * 16;;
-            data->unk_28 = temp_v1_3 * 16;;
+            data->unk_24 = temp_v1_3 * 16;
+            data->unk_28 = temp_v1_3 * 16;
         }
         if (temp_s0 < 16) {
             data->unk_24 = (temp_s0 * 16) + 15;
diff --git a/src/effects/windy_leaves.c b/src/effects/windy_leaves.c
index 6fc356c133..76f00153d3 100644
--- a/src/effects/windy_leaves.c
+++ b/src/effects/windy_leaves.c
@@ -20,7 +20,7 @@ void windy_leaves_main(s32 type, f32 arg1, f32 arg2, f32 arg3) {
     bp.unk_00 = 0;
     bp.unk_14 = NULL;
     bp.effectID = EFFECT_WINDY_LEAVES;
-    
+
     numParts = 5;
     effect = shim_create_effect_instance(bpPtr);
     effect->numParts = numParts;
@@ -52,7 +52,7 @@ void windy_leaves_main(s32 type, f32 arg1, f32 arg2, f32 arg3) {
                 part->unk_10 = 0.0f;
                 part->unk_14 = 0.0f;
                 part->unk_34 = 0;
-                part->unk_30 = -3.0f;;
+                part->unk_30 = -3.0f;
                 part->unk_38 = 3.0f;
                 part->unk_1C = (f32)temp_v0_2 * 0.1;
                 break;
diff --git a/src/encounter.c b/src/encounter.c
index b2fd595b89..f2d309de50 100644
--- a/src/encounter.c
+++ b/src/encounter.c
@@ -1863,7 +1863,7 @@ void update_encounters_post_battle(void) {
                 }
 
                 enemy = currentEncounter->currentEnemy;
-                encounter = currentEncounter->currentEncounter;;
+                encounter = currentEncounter->currentEncounter;
                 if (!(enemy->flags & ENEMY_FLAG_40000)) {
                     enemy->aiPaused = 45;
                     playerStatus->blinkTimer = 45;
diff --git a/src/pause/pause_tabs.c b/src/pause/pause_tabs.c
index 107127d4a1..8f0ad410b1 100644
--- a/src/pause/pause_tabs.c
+++ b/src/pause/pause_tabs.c
@@ -126,7 +126,7 @@ MenuWindowBP gPauseTabsWindowBPs[] = {
 s32 gPauseTabsCurrentTab = 0;
 s32 gPauseTabsMessages[] = { 27, 28, 29, 30, 31, 32 };
 u8 gPauseTabsInterpTable[] = { 0, 1, 2, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8 };
-s32 D_8024F310 = 1;
+s32 gPauseDoBasicWindowUpdate = TRUE; // TODO rename (eth name)
 MenuPanel gPausePanelTabs = {
     .initialized = FALSE,
     .col = 0,
@@ -385,9 +385,9 @@ void pause_tabs_update(MenuPanel* tab) {
             if (gWindows[gPauseTabsPageWindowIDs[tab->col]].fpUpdate.func == pause_update_page_inactive_1 ||
                 gWindows[gPauseTabsPageWindowIDs[tab->col]].fpUpdate.func == pause_update_page_inactive_2 ||
                 gWindows[gPauseTabsPageWindowIDs[tab->col]].fpUpdate.i == 2) {
-                if (D_8024F310 != 0) {
+                if (gPauseDoBasicWindowUpdate) {
                     fpUpdateActive = &basic_window_update;
-                    D_8024F310 = 0;
+                    gPauseDoBasicWindowUpdate = FALSE;
                 }
 
                 set_window_update(gPauseTabsPageWindowIDs[tab->col], (s32)fpUpdateActive);
diff --git a/src/world/area_hos/hos_05/A2AAC0.c b/src/world/area_hos/hos_05/A2AAC0.c
index 4abfcc333c..5bb3cb3d83 100644
--- a/src/world/area_hos/hos_05/A2AAC0.c
+++ b/src/world/area_hos/hos_05/A2AAC0.c
@@ -108,15 +108,18 @@ BSS f32 D_8024F2EC;
 BSS f32 D_8024F2F0;
 BSS f32 D_8024F2F4;
 BSS f32 D_8024F2F8;
-BSS s32 D_8024F2FC;
-BSS s32 D_8024F300;
-BSS s32 D_8024F304;
-BSS s32 D_8024F308;
-BSS s32 D_8024F30C;
-BSS char B_8024F310[0x8];
-BSS char D_8024F318[0x20];
-BSS char D_8024F338[0x20];
-BSS char D_8024F358[0x1C];
+BSS f32 D_8024F2FC;
+BSS f32 D_8024F300;
+BSS f32 D_8024F304;
+BSS f32 D_8024F308;
+BSS f32 D_8024F30C;
+BSS f32 D_8024F310;
+BSS char B_8024F314[0x4];
+BSS f32 D_8024F318[7];
+BSS char D_8024F334[0x4];
+BSS f32 D_8024F338[7];
+BSS char D_8024F354[0x4];
+BSS f32 D_8024F358[7];
 BSS f32 D_8024F374;
 BSS f32 D_8024F378;
 BSS char D_8024F37C[0x4];
@@ -875,7 +878,52 @@ void func_80243ED0_A2E110(s32 arg0, s32 idx) {
     }
 }
 
+// close-ish
+#ifdef NON_MATCHING
+ApiStatus func_80243FC4_A2E204(Evt* script, s32 isInitialCall) {
+    s32 dmaEnd;
+    s32 dmaStart;
+    s32 someLength;
+    void* textureAddress;
+
+    D_8024AA20_A34C60->unk_00 = create_worker_frontUI(NULL, func_80243CC0_A2DF00);
+    textureAddress = mdl_get_next_texture_address(0x1D420);
+    D_8024AA20_A34C60->unk_08 = textureAddress + 0xA710;
+    D_8024AA20_A34C60->unk_0C = (u8*)D_8024AA20_A34C60->unk_08 + 0x200;
+    D_8024AA20_A34C60->unk_10 = (u8*)D_8024AA20_A34C60->unk_0C + 0xA710;
+    D_8024AA20_A34C60->unk_18 = (u8*)D_8024AA20_A34C60->unk_10 + 0x200;
+    D_8024AA20_A34C60->unk_1C = (u8*)D_8024AA20_A34C60->unk_18 + 0x4000;
+    D_8024AA20_A34C60->unk_20 = (u8*)D_8024AA20_A34C60->unk_1C + 0x4000;
+    D_8024AA20_A34C60->unk_04 = textureAddress;
+    D_8024AA20_A34C60->unk_46 = 240;
+    D_8024AA20_A34C60->unk_48 = 111;
+    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_44 = 0;
+    D_8024AA20_A34C60->unk_4A = 54;
+    func_80243ED0_A2E110(0, 0);
+    func_80243ED0_A2E110(1, 1);
+
+    someLength = 0x2A440;
+
+    dmaStart = title_bg_1_ROM_START;
+    dmaEnd = dmaStart + someLength;
+
+    dmaEnd += 0x4000;
+    dmaEnd += someLength;
+    dmaEnd += 0x4200;
+
+    dma_copy(dmaStart, dmaEnd, D_8024AA20_A34C60->unk_18);
+    D_8024AA20_A34C60->unk_58 = 0;
+    D_8024AA20_A34C60->unk_5A = 255;
+    D_8024AA20_A34C60->unk_5C = 0;
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243FC4_A2E204);
+#endif
 
 NOP_FIX // TODO remove when D_8024AAB4_A34CF4 is migrated
 
@@ -997,7 +1045,52 @@ ApiStatus func_802444E8_A2E728(Evt* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
+#ifdef NON_MATCHING
+ApiStatus func_80244550_A2E790(Evt* script, s32 isInitialCall) {
+    Npc* npc = resolve_npc(script, 9);
+    EffectInstance* effect = evt_get_variable(script, ArrayVar(0));
+    f32 x, y, z;
+    s32 i;
+
+    if (isInitialCall) {
+        D_8024F2FC = npc->pos.x;
+        D_8024F300 = npc->pos.y;
+        D_8024F304 = npc->pos.z;
+
+        for (i = 0; i < ARRAY_COUNT(D_8024F318); i++) {
+            Npc* npc2 = resolve_npc(script, i);
+
+            D_8024F318[i] = npc2->pos.x;
+            D_8024F338[i] = npc2->pos.y;
+            D_8024F358[i] = npc2->pos.z;
+        }
+        D_8024F308 = effect->data.somethingRotating->unk_04;
+        D_8024F30C = effect->data.somethingRotating->unk_08;
+        D_8024F310 = effect->data.somethingRotating->unk_0C;
+    }
+
+    x = npc->pos.x - D_8024F2FC;
+    y = npc->pos.y - D_8024F300;
+    z = npc->pos.z - D_8024F304;
+
+    for (i = 0; i < ARRAY_COUNT(D_8024F318); i++) {
+        Npc* npc2 = resolve_npc(script, i);
+
+        npc2->pos.x = D_8024F318[i] + x;
+        npc2->pos.y = D_8024F338[i] + y;
+        npc2->pos.z = D_8024F358[i] + z;
+        npc2->colliderPos.x = npc2->pos.x;
+        npc2->colliderPos.y = npc2->pos.y;
+        npc2->colliderPos.z = npc2->pos.z;
+    }
+    effect->data.somethingRotating->unk_04 = D_8024F308 + x;
+    effect->data.somethingRotating->unk_08 = D_8024F30C + y;
+    effect->data.somethingRotating->unk_0C = D_8024F310 + z;
+    return ApiStatus_BLOCK;
+}
+#else
 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244550_A2E790);
+#endif
 
 ApiStatus func_80244774_A2E9B4(Evt* script, s32 isInitialCall) {
     Npc* npc7 = resolve_npc(script, 7);
diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c
index 7a4219f194..9a2f24db2c 100644
--- a/src/world/area_hos/hos_06/A397F0.c
+++ b/src/world/area_hos/hos_06/A397F0.c
@@ -16,10 +16,9 @@ extern IconHudScriptPair gItemHudScripts[];
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 #define NAMESPACE hos_06
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c
index 4da12c6083..28f69ea633 100644
--- a/src/world/area_hos/hos_06/A3A230.c
+++ b/src/world/area_hos/hos_06/A3A230.c
@@ -9,11 +9,9 @@
 extern u8 D_802447D0_A3DCB0[];
 
 #define NAMESPACE dup_hos_06
-
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -22,7 +20,6 @@ ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     N(ItemChoice_HasSelectedItem) = TRUE;
     return ApiStatus_DONE2;
 }
-
 #define NAMESPACE hos_06
 
 extern s32 hos_06_D_80246430[];
diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c
index 2dc302d4f8..54e0a6f25a 100644
--- a/src/world/area_jan/jan_02/B2C8A0.c
+++ b/src/world/area_jan/jan_02/B2C8A0.c
@@ -8,10 +8,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c
index 0060fd7677..5e1f0553df 100644
--- a/src/world/area_jan/jan_03/B34BD0.c
+++ b/src/world/area_jan/jan_03/B34BD0.c
@@ -27,10 +27,9 @@ static char* N(exit_str_4) = "tik_08";
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_kkj/kkj_13/AD6200.c b/src/world/area_kkj/kkj_13/AD6200.c
index a10485beea..27b6f169c8 100644
--- a/src/world/area_kkj/kkj_13/AD6200.c
+++ b/src/world/area_kkj/kkj_13/AD6200.c
@@ -67,7 +67,45 @@ ApiStatus func_8024046C_AD633C(Evt* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
-INCLUDE_ASM(s32, "world/area_kkj/kkj_13/AD6200", func_802404E0_AD63B0);
+typedef struct UnkKKJ13 {
+    /* 0x00 */ s16 unk_00;
+    /* 0x02 */ s16 unk_02;
+} UnkKKJ13; // size = 0x4
+
+extern UnkKKJ13 D_80243614_AD94E4[28]; // TODO remove hard-coded size once data is migrated
+
+ApiStatus func_802404E0_AD63B0(Evt* script, s32 isInitialCall) {
+    EffectInstance* effect;
+    f32 temp_f20;
+    f32 temp_f24;
+    f32 temp_f26;
+    s32 a0;
+    f32 a1;
+    f32 a2;
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(D_80243614_AD94E4); i++) {
+        a0 = (i & 1) + 2;
+        temp_f20 = D_80243614_AD94E4[i].unk_00;
+        temp_f24 = (temp_f20 * cos_deg(D_80243614_AD94E4[i].unk_02)) * 1.3;
+        temp_f26 = (temp_f20 * sin_deg(D_80243614_AD94E4[i].unk_02)) * 1.5;
+        a1 = temp_f24 + 600.0f;
+        a2 = temp_f26 + 100.0f;
+        temp_f24 *= 0.1;
+        temp_f26 *= 0.1;
+        temp_f24 += cos_deg(temp_f20 * 15.0f) * 5.0f;
+        effect = fx_ice_shard(a0, a1, a2, -150.0f, ((i & 3) * 0.4) + 1.0, ((i & 3) * 4) + 30);
+        effect->data.iceShard->unk_44 = 0;
+        effect->data.iceShard->unk_48 = (rand_int(10) * 0.2) + 0.1;
+        effect->data.iceShard->unk_3C = 35 * i;
+        effect->data.iceShard->unk_40 = rand_int(10) - 5;
+        effect->data.iceShard->unk_4C = temp_f24;
+        effect->data.iceShard->unk_50 = temp_f26;
+        effect->data.iceShard->unk_54 = 2.0f;
+        effect->data.iceShard->unk_58 = -0.1f;
+    }
+    return ApiStatus_DONE2;
+}
 
 const char* N(exit_str_0) = "osr_03";
 const char* N(exit_str_1) = "hos_10";
diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c
index 477fc06d66..1ac722d4bf 100644
--- a/src/world/area_kkj/kkj_18/AF2FE0.c
+++ b/src/world/area_kkj/kkj_18/AF2FE0.c
@@ -1,33 +1,13 @@
 #include "kkj_18.h"
 #include "camera.h"
 
-extern s32 N(ItemChoice_HasSelectedItem);
-extern s32 N(ItemChoice_SelectedItemID);
-
 #include "world/common/todo/GetNpcCollisionHeight.inc.c"
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-// Needs data migration, matching otherwise
-#ifdef NON_MATCHING
-ApiStatus func_8024056C_AF320C(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        kkj_18_ItemChoice_HasSelectedItem = 0;
-    }
-
-    if (kkj_18_ItemChoice_HasSelectedItem != 0) {
-        kkj_18_ItemChoice_HasSelectedItem = 0;
-        evt_set_variable(script, *args++, kkj_18_ItemChoice_SelectedItemID);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-#else
-INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_8024056C_AF320C);
-#endif
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c
index a51b761215..ec34b19a4e 100644
--- a/src/world/area_kkj/kkj_19/AF7C00.c
+++ b/src/world/area_kkj/kkj_19/AF7C00.c
@@ -2,9 +2,6 @@
 #include "hud_element.h"
 #include "battle/action_cmd.h"
 
-extern s32 kkj_19_ItemChoice_HasSelectedItem;
-extern s32 kkj_19_ItemChoice_SelectedItemID;
-
 BSS s32 kkj_19_D_802461F0[114];
 BSS s32 D_802463B8_kkj_19[92];
 BSS s32 kkj_19_D_80246528;
@@ -26,26 +23,9 @@ BSS s32 D_802465A0;
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-// Needs data migration, matching otherwise
-#ifdef NON_MATCHING
-ApiStatus func_802404DC_AF7E2C(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        kkj_19_ItemChoice_HasSelectedItem = 0;
-    }
-
-    if (kkj_19_ItemChoice_HasSelectedItem != 0) {
-        kkj_19_ItemChoice_HasSelectedItem = 0;
-        evt_set_variable(script, *args++, kkj_19_ItemChoice_SelectedItemID);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-#else
-INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802404DC_AF7E2C);
-#endif
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c
index d7a1eb9523..c74891ce49 100644
--- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c
+++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c
@@ -1357,8 +1357,7 @@ EvtScript N(EVS_NpcInteract_Toad) = {
 
 #include "world/common/todo/SyncStatusMenu.inc.c"
 
-#ifdef NON_EQUIVALENT
-// control flow + data migration
+NOP_FIX // TODO figure out BSS nop issue
 ApiStatus func_8024295C_8B29CC(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32 targetColR = evt_get_variable(script, *args++);
@@ -1382,17 +1381,15 @@ ApiStatus func_8024295C_8B29CC(Evt* script, s32 isInitialCall) {
 
         script->functionTemp[0]++;
         if (duration < script->functionTemp[0]) {
-            return ApiStatus_BLOCK;
+            return ApiStatus_DONE2;
         }
     } else {
         set_background_color_blend(targetColR, targetColG, targetColB, targetColA);
+        return ApiStatus_DONE2;
     }
-    return ApiStatus_DONE2;
+    return ApiStatus_BLOCK;
 }
-#else
-API_CALLABLE(func_8024295C_8B29CC);
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC);
-#endif
+NOP_UNFIX
 
 API_CALLABLE(N(func_80242BA8_8B2C18)) {
     *gBackgroundFogModePtr = 1;
diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c
index 2692566185..f66c41c91a 100644
--- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c
+++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c
@@ -238,7 +238,7 @@ API_CALLABLE(N(FlashScreenWhite)) {
                 script->functionTemp[0] = HOLD_WHITE;
                 script->functionTemp[1] = 15;
             } else {
-                data->screenWhiteness += 50;;
+                data->screenWhiteness += 50;
                 if (data->screenWhiteness > 255) {
                     data->screenWhiteness = 255;
                 }
@@ -256,7 +256,7 @@ API_CALLABLE(N(FlashScreenWhite)) {
                 set_curtain_scale_goal(1.0f);
                 return ApiStatus_DONE1;
             }
-            data->screenWhiteness -= 20;;
+            data->screenWhiteness -= 20;
             if (data->screenWhiteness < 0) {
                 data->screenWhiteness = 0;
             }
diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c
index 7168effbc0..8719aa06b0 100644
--- a/src/world/area_nok/nok_01/9C53E0.c
+++ b/src/world/area_nok/nok_01/9C53E0.c
@@ -1,9 +1,6 @@
 #include "nok_01.h"
 #include "effects.h"
 
-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";
 
@@ -25,25 +22,9 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-// Requires data migration
-#ifdef NON_MATCHING
-ApiStatus func_80242028_9C7408(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        nok_01_ItemChoice_HasSelectedItem = FALSE;
-    }
-
-    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;
-}
-#else
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408);
-#endif
+extern s32 N(ItemChoice_HasSelectedItem);
+extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c
index 01dfbdb2d1..71649ee3ff 100644
--- a/src/world/area_nok/nok_02/9D7020.c
+++ b/src/world/area_nok/nok_02/9D7020.c
@@ -14,10 +14,9 @@ static char* N(exit_str_3) = "";
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 #define NAMESPACE nok_02
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c
index 1e0d1df526..eaac7a9bab 100644
--- a/src/world/area_nok/nok_02/9D7AA0.c
+++ b/src/world/area_nok/nok_02/9D7AA0.c
@@ -19,11 +19,10 @@ extern EffectInstance* N(Quizmo_VannaTEffect);
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0);
-
 #define NAMESPACE dup_nok_02
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c
index c7f30a633b..946bfce228 100644
--- a/src/world/area_nok/nok_02/9DA8F0.c
+++ b/src/world/area_nok/nok_02/9DA8F0.c
@@ -34,10 +34,9 @@ ApiStatus func_802438D0_9DA8F0(Evt* script, s32 isInitialCall) {
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -112,7 +111,7 @@ typedef struct UnkNok02 {
     /* 0x00 */ s32 unk_00;
     /* 0x04 */ s32 unk_04;
     /* 0x08 */ s32 unk_08;
-    /* 0x0C */ char unk_0C[0x4];
+    /* 0x0C */ s32 unk_0C;
     /* 0x10 */ s32 unk_10;
     /* 0x14 */ s32 unk_14;
     /* 0x18 */ s32 unk_18;
@@ -121,11 +120,100 @@ typedef struct UnkNok02 {
 extern UnkNok02 D_80252784_9E97A4[20];
 extern s32 D_802529B4_9E99D4;
 
-ApiStatus func_80243F10_9DAF30(Evt* script, s32 isInitialCall);
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243F10_9DAF30);
+ApiStatus func_80243F10_9DAF30(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 a0 = *args++;
+    u32 count = 0;
+    UnkNok02* it = D_80252784_9E97A4;
+    u32 i;
 
-ApiStatus func_80244078_9DB098(Evt* script, s32 isInitialCall);
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80244078_9DB098);
+    for (i = 0; i < ARRAY_COUNT(D_80252784_9E97A4); i++, it++) {
+        if (evt_get_variable(script, it->unk_0C) != 0 && evt_get_variable(script, it->unk_14) == 0) {
+            count++;
+            if (evt_get_variable(script, it->unk_10) == 0) {
+                break;
+            }
+        }
+    }
+
+    if (i == ARRAY_COUNT(D_80252784_9E97A4)) {
+        if (count == 0) {
+            script->varTable[0] = 0;
+            evt_set_variable(script, a0, 0xFF);
+            return ApiStatus_DONE2;
+        } else {
+            s32 temp_s6 = rand_int(count - 1);
+            count = 0;
+
+            it = D_80252784_9E97A4;
+            for (i = 0; i < ARRAY_COUNT(D_80252784_9E97A4); i++, it++) {
+                if (evt_get_variable(script, it->unk_0C) != 0 && evt_get_variable(script, it->unk_14) == 0) {
+                    if (count++ == temp_s6) {
+                        break;
+                    }
+                }
+            }
+        }
+        script->varTable[0] = it->unk_00;
+        evt_set_variable(script, a0, i + 1);
+        return ApiStatus_DONE2;
+    } else {
+        script->varTable[0] = it->unk_00;
+        evt_set_variable(script, a0, i + 1);
+        return ApiStatus_DONE2;
+    }
+}
+
+ApiStatus func_80244078_9DB098(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 a0 = *args++;
+    s32 count = 0;
+    s32 thing = evt_get_variable(script, a0) - 1;
+    UnkNok02* it = D_80252784_9E97A4;
+    u32 i;
+
+    evt_set_variable(script, D_80252784_9E97A4[thing].unk_10, 1);
+
+    for (i = 0; i < ARRAY_COUNT(D_80252784_9E97A4); i++, it++) {
+        if (evt_get_variable(script, it->unk_0C) != 0 && evt_get_variable(script, it->unk_14) == 0) {
+            count++;
+            if (evt_get_variable(script, it->unk_10) == 0) {
+                break;
+            }
+        }
+    }
+
+    if (i == ARRAY_COUNT(D_80252784_9E97A4)) {
+        if (count < 2) {
+            script->varTable[0] = 0;
+            evt_set_variable(script, a0, 0xFF);
+            return ApiStatus_DONE2;
+        } else {
+            s32 temp_s6 = rand_int(count - 2);
+
+            count = 0;
+
+            it = D_80252784_9E97A4;
+            for (i = 0; i < ARRAY_COUNT(D_80252784_9E97A4); i++, it++) {
+                if (i != thing &&
+                    evt_get_variable(script, it->unk_0C) != 0 &&
+                    evt_get_variable(script, it->unk_14) == 0)
+                {
+                    if (count++ == temp_s6) {
+                        break;
+                    }
+                }
+            }
+        }
+        script->varTable[0] = it->unk_00;
+        evt_set_variable(script, a0, i + 1);
+        return ApiStatus_DONE2;
+    } else {
+        script->varTable[0] = it->unk_00;
+        evt_set_variable(script, a0, i + 1);
+        return ApiStatus_DONE2;
+    }
+}
 
 ApiStatus func_80244224_9DB244(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c
index cfc1f21f19..ab2729c529 100644
--- a/src/world/area_omo/omo_02/D9D510.c
+++ b/src/world/area_omo/omo_02/D9D510.c
@@ -1,7 +1,9 @@
 #include "omo_02.h"
 #include "model.h"
 
-extern s32 D_802434F8_DA09C8[];
+extern s32 D_802434F8_DA09C8[2]; // TODO: remove hard-coded size once the data is migrated
+extern s32 D_80243580_DA0A50[12]; // TODO: remove hard-coded size once the data is migrated
+extern s32 D_802435B0_DA0A80[];
 
 ApiStatus func_80240040_D9D510(Evt* script, s32 isInitialCall) {
     Matrix4f sp18, sp58;
@@ -15,7 +17,7 @@ ApiStatus func_80240040_D9D510(Evt* script, s32 isInitialCall) {
         it = heap_malloc(sizeof(*it) * 2);
         script->functionTempPtr[0] = it;
 
-        for (i = 0; i < 2; i++, it++) {
+        for (i = 0; i < ARRAY_COUNT(D_802434F8_DA09C8); i++, it++) {
             s32 treeIndex = D_802434F8_DA09C8[i];
 
             it->treeIndex = treeIndex;
@@ -29,7 +31,7 @@ ApiStatus func_80240040_D9D510(Evt* script, s32 isInitialCall) {
     }
 
     it = script->functionTempPtr[0];
-    for (i = 0; i < 2; i++, it++) {
+    for (i = 0; i < ARRAY_COUNT(D_802434F8_DA09C8); i++, it++) {
         it->unk_10 += it->unk_0C;
         it->unk_10 = clamp_angle(it->unk_10);
         temp_f20 = sin_rad((it->unk_10 * 3.14f) / 180.0f) * 20.0f;
@@ -51,9 +53,161 @@ ApiStatus func_80240040_D9D510(Evt* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
-INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802402C0_D9D790);
+void func_802402C0_D9D790(Gfx* displayList, s32* outDist) {
+    char pad[0x8];
+    Gfx* dlist = displayList;
+    u8 cmd;
 
-INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024043C_D9D90C);
+    do {
+        u32 temp_s2 = dlist->words.w0;
+        u32 temp_s3 = dlist->words.w1;
+
+        cmd = temp_s2 >> 0x18;
+        if (cmd == G_DL) {
+            func_802402C0_D9D790((Gfx*) temp_s3, outDist);
+        }
+        if (cmd == G_VTX) {
+            s32 numVertices = (temp_s2 >> 0xC) & 0xFF;
+            Vtx* vtx = (Vtx*) temp_s3;
+            f32 subX, subY, subZ;
+            s32 i;
+
+            subX = subY = subZ = 0.0f;
+
+            *outDist = -1;
+
+            for (i = 0; i < numVertices; i++) {
+                f32 x = vtx[i].v.ob[0] - subX;
+                f32 y = vtx[i].v.ob[1] - subY;
+                f32 z = vtx[i].v.ob[2] - subZ;
+                f32 dist = sqrtf(SQ(x) + SQ(y) + SQ(z));
+
+                if (*outDist < dist) {
+                    *outDist = dist;
+                }
+            }
+        }
+        dlist++;
+    } while (cmd != G_ENDDL);
+}
+
+typedef struct UnkOmoThing {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ Vec3f center;
+    /* 0x10 */ Vec3f unk_10;
+    /* 0x1C */ Vec3f rot;
+    /* 0x28 */ Vec3f unk_28;
+    /* 0x34 */ f32 unk_34;
+    /* 0x38 */ f32 unk_38;
+    /* 0x3C */ f32 unk_3C;
+    /* 0x40 */ s32 treeIndex;
+    /* 0x44 */ s32 colliderID;
+    /* 0x48 */ Matrix4f transformMatrix;
+    /* 0x88 */ s32 unk_88;
+} UnkOmoThing; // size = 0x8C
+
+ApiStatus func_8024043C_D9D90C(Evt* script, s32 isInitialCall) {
+    Matrix4f sp18, sp58, sp98, spD8;
+    Model* model;
+    UnkOmoThing* data;
+    UnkOmoThing* it;
+    u32 i;
+    s32 j, k;
+
+    if (isInitialCall) {
+        script->functionTempPtr[0] = heap_malloc(sizeof(*data) * 12);
+        script->functionTemp[1] = 0;
+
+        it = (UnkOmoThing*) script->functionTempPtr[0];
+        for (i = 0; i < ARRAY_COUNT(D_80243580_DA0A50); i++, it++) {
+            it->treeIndex = D_80243580_DA0A50[i];
+            it->colliderID = D_802435B0_DA0A80[i];
+            model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex));
+            it->unk_00 = 0;
+            it->center.x = model->center.x;
+            it->center.y = model->center.y;
+            it->center.z = model->center.z;
+            it->rot.x = 0.0f;
+            it->rot.y = 0.0f;
+            it->rot.z = 0.0f;
+            it->unk_10.x = it->center.x;
+            it->unk_10.y = it->center.y;
+            it->unk_10.z = it->center.z;
+            it->unk_28.x = rand_int(20) - 10;
+            it->unk_28.y = rand_int(20) - 10;
+            it->unk_28.z = rand_int(20) - 10;
+            it->unk_34 = (rand_int(40) + 100.0f) / 10.0f;
+            it->unk_38 = (rand_int(30) + 60.0f) / 10.0f;
+            it->unk_3C = ((rand_int(100) % 2) * 180.0f) + 90.0f;
+            func_802402C0_D9D790(model->modelNode->displayData->displayList, &it->unk_88);
+
+            for (j = 0; j < 4; j++) {
+                for (k = 0; k < 4; k++) {
+                    it->transformMatrix[j][k] = model->transformMatrix[j][k];
+                }
+            }
+        }
+    }
+
+    it = script->functionTempPtr[0];
+    for (i = 0; i < ARRAY_COUNT(D_80243580_DA0A50); i++, it++) {
+        model = get_model_from_list_index(get_model_list_index_from_tree_index(it->treeIndex));
+        if (it->unk_00 != 100) {
+            if (it->unk_00 < 101) {
+                if (it->unk_00 == 0) {
+                    add_vec2D_polar(&it->center.x, &it->center.z, it->unk_38, it->unk_3C);
+                    it->unk_34 -= 0.8f;
+                    it->center.y += it->unk_34;
+                    if (it->unk_34 <= 0.0f && it->center.y < it->unk_88) {
+                        it->center.y = it->unk_88;
+                        it->unk_34 *= -0.7f;
+                        if (it->unk_34 < 1.0f) {
+                            it->unk_00 = 100;
+                            it->unk_28.x = 0.0f;
+                            it->unk_28.y = 0.0f;
+                            it->unk_28.z = 0.0f;
+                        }
+                        if (i & 1) {
+                            exec_ShakeCam1(0, 0, 1);
+                        }
+                    }
+                }
+            }
+        } else {
+            update_collider_transform(it->colliderID);
+            script->functionTemp[1]++;
+            it->unk_00 = 101;
+        }
+
+        for (j = 0; j < 4; j++) {
+            for (k = 0; k < 4; k++) {
+                model->transformMatrix[j][k] = it->transformMatrix[j][k];
+            }
+        }
+
+        model->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED;
+        guTranslateF(sp18, it->center.x - it->unk_10.x, it->center.y - it->unk_10.y, it->center.z - it->unk_10.z);
+        it->rot.x += it->unk_28.x;
+        it->rot.y += it->unk_28.y;
+        it->rot.z += it->unk_28.z;
+        it->rot.x = clamp_angle(it->rot.x);
+        it->rot.y = clamp_angle(it->rot.y);
+        it->rot.z = clamp_angle(it->rot.z);
+        guRotateF(sp58, it->rot.x, 1.0f, 0.0f, 0.0f);
+        guRotateF(sp98, it->rot.y, 0.0f, 1.0f, 0.0f);
+        guRotateF(spD8, it->rot.z, 0.0f, 0.0f, 1.0f);
+        guMtxCatF(spD8, sp58, sp58);
+        guMtxCatF(sp58, sp98, sp98);
+        guMtxCatF(sp98, sp18, sp18);
+        guMtxCatF(model->transformMatrix, sp18, model->transformMatrix);
+    }
+
+    if ((u32) script->functionTemp[1] >= ARRAY_COUNT(D_80243580_DA0A50)) {
+        heap_free(script->functionTempPtr[0]);
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}
 
 #include "world/common/enemy/ai/ShyGuyWanderAI.inc.c"
 
diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c
index 65cdf9240d..b505345ecc 100644
--- a/src/world/area_omo/omo_13/DE2710.c
+++ b/src/world/area_omo/omo_13/DE2710.c
@@ -9,29 +9,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-// matches, needs data migration
-#ifdef NON_MATCHING
-ApiStatus func_80240F00_DE3390(Evt* script, s32 isInitialCall) {
-    Bytecode* args = script->ptrReadPos;
-
-    if (isInitialCall) {
-        omo_13_ItemChoice_HasSelectedItem = FALSE;
-    }
-
-    if (omo_13_ItemChoice_HasSelectedItem) {
-        omo_13_ItemChoice_HasSelectedItem = FALSE;
-        evt_set_variable(script, *args++, omo_13_ItemChoice_SelectedItemID);
-        return ApiStatus_DONE2;
-    }
-
-    return ApiStatus_BLOCK;
-}
-#else
-INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390);
-#endif
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c
index 764d5a5503..e27337f2ff 100644
--- a/src/world/area_pra/pra_01/D4D060.c
+++ b/src/world/area_pra/pra_01/D4D060.c
@@ -13,10 +13,9 @@ ApiStatus func_80240F60_D4DFA0(Evt* script, s32 isInitialCall) {
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c
index d44fb04c1d..a3e55347e3 100644
--- a/src/world/area_pra/pra_02/D50010.c
+++ b/src/world/area_pra/pra_02/D50010.c
@@ -6,10 +6,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_8024114C_D5113C);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c
index fe92c5f04d..a05ed35f01 100644
--- a/src/world/area_pra/pra_09/D588B0.c
+++ b/src/world/area_pra/pra_09/D588B0.c
@@ -7,10 +7,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c
index a2f95a806c..24d0c29d16 100644
--- a/src/world/area_pra/pra_13/D64600.c
+++ b/src/world/area_pra/pra_13/D64600.c
@@ -6,10 +6,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c
index 861f803874..662c055d2e 100644
--- a/src/world/area_pra/pra_19/D6E9D0.c
+++ b/src/world/area_pra/pra_19/D6E9D0.c
@@ -6,10 +6,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -177,7 +176,7 @@ ApiStatus func_8024175C_D7010C(Evt* script, s32 isInitialCall) {
     if (npc4->pos.x < playerX) {
         return ApiStatus_DONE2;
     }
-    return ApiStatus_BLOCK;;
+    return ApiStatus_BLOCK;
 }
 
 ApiStatus func_80241838_D701E8(Evt* script, s32 isInitialCall) {
diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c
index 9d882e2300..a4098d0283 100644
--- a/src/world/area_pra/pra_31/D7ED80.c
+++ b/src/world/area_pra/pra_31/D7ED80.c
@@ -4,10 +4,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c
index a06786facd..add2a50c00 100644
--- a/src/world/area_sam/sam_01/CF7E80.c
+++ b/src/world/area_sam/sam_01/CF7E80.c
@@ -7,10 +7,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_sam/sam_04/D138E0.c b/src/world/area_sam/sam_04/D138E0.c
index b9ff59f715..eb0b79be7b 100644
--- a/src/world/area_sam/sam_04/D138E0.c
+++ b/src/world/area_sam/sam_04/D138E0.c
@@ -4,10 +4,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c
index 0207e5497f..e032acc540 100644
--- a/src/world/area_sam/sam_06/D203E0.c
+++ b/src/world/area_sam/sam_06/D203E0.c
@@ -11,10 +11,9 @@
 
 #include "world/common/todo/AddPlayerHandsOffset.inc.c"
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C);
-
 extern s32 N(ItemChoice_HasSelectedItem);
 extern s32 N(ItemChoice_SelectedItemID);
+#include "world/common/todo/ItemChoice_WaitForSelection.inc.c"
 
 ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c
index a04c9fe3fa..3a8cba2da7 100644
--- a/src/world/area_sam/sam_11/D3ADA0.c
+++ b/src/world/area_sam/sam_11/D3ADA0.c
@@ -75,40 +75,41 @@ ApiStatus func_80241A6C_D3C03C(Evt* script, s32 isInitialCall) {
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-// float regalloc
-#ifdef NON_MATCHING
 ApiStatus func_80241DAC_D3C37C(Evt* script, s32 isInitialCall) {
     EffectInstance* effect;
-    f32 temp_f22;
-    f32 f1;
-    f32 f2;
-    f32 f3;
-    f32 f4;
+    f32 a5;
+    f32 a3;
+    f32 a1;
+    f32 delta;
+
+    f32 t1;
+    f32 t2;
     s32 i;
 
     for (i = 0; i < 24; i++) {
-        f2 = ((i / 6) * 40) - 100;
-        f1 = ((i % 6) * 40) - 100;
-        f3 = f1 + (0.0f);
-        temp_f22 = f2;
-        f1 = f1 * 0.1;
-        f2 = f2 * 0.1;
-        effect = fx_ice_shard(i & 1, f3, -10.0f, temp_f22 + 250.0f, 2.0 * ((i & 3) + 1.0), ((i & 3) * 4) + 30);
-        temp_f22 = 4.0f;
+        a1 = t1 = ((i % 6) * 40) - 100;
+        a3 = t2 = ((i / 6) * 40) - 100;
+
+        a1 += a5 = 0.0f; // TODO required to match;
+        a3 += 250.0f;
+
+        t1 *= 0.1;
+        t2 *= 0.1;
+
+        effect = fx_ice_shard(i & 1, a1, -10.0f, a3, 2.0 * ((i & 3) + 1.0), ((i & 3) * 4) + 30);
+
+        a5 = 4.0f;
         effect->data.iceShard->unk_44 = 0.0f;
         effect->data.iceShard->unk_48 = (rand_int(10) * 0.2) + 0.1;
         effect->data.iceShard->unk_3C = i * 35;
         effect->data.iceShard->unk_40 = rand_int(10) - 5;
-        effect->data.iceShard->unk_4C = f1;
-        effect->data.iceShard->unk_50 = temp_f22;
-        effect->data.iceShard->unk_54 = f2;
+        effect->data.iceShard->unk_4C = t1;
+        effect->data.iceShard->unk_50 = a5;
+        effect->data.iceShard->unk_54 = t2;
         effect->data.iceShard->unk_58 = -0.1f;
     }
     return ApiStatus_DONE2;
 }
-#else
-INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241DAC_D3C37C);
-#endif
 
 static char* N(exit_str_0) = "sam_02";
 
diff --git a/src/world/common/lava_piranha/part2.inc.c b/src/world/common/lava_piranha/part2.inc.c
index dbaa5065c3..dcd2504925 100644
--- a/src/world/common/lava_piranha/part2.inc.c
+++ b/src/world/common/lava_piranha/part2.inc.c
@@ -247,7 +247,7 @@ void N(appendGfx_piranha_vines)(void* data) {
             vtx->tc[0] = j * 0x140;
             vtx->tc[1] = 0;
             vtx->cn[0] = j * 50;
-            vtx->cn[1] = j * 120;;
+            vtx->cn[1] = j * 120;
             vtx->cn[2] = j * 30;
             vtx++;
 
@@ -257,7 +257,7 @@ void N(appendGfx_piranha_vines)(void* data) {
             vtx->tc[0] = j * 0x140;
             vtx->tc[1] = 0x400;
             vtx->cn[0] = j * 50;
-            vtx->cn[1] = j * 120;;
+            vtx->cn[1] = j * 120;
             vtx->cn[2] = j * 30;
             vtx++;
         }
diff --git a/src/world/common/todo/ItemChoice_WaitForSelection.inc.c b/src/world/common/todo/ItemChoice_WaitForSelection.inc.c
new file mode 100644
index 0000000000..4094e8b5a8
--- /dev/null
+++ b/src/world/common/todo/ItemChoice_WaitForSelection.inc.c
@@ -0,0 +1,19 @@
+#include "common.h"
+
+NOP_FIX
+ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    if (isInitialCall) {
+        N(ItemChoice_HasSelectedItem) = FALSE;
+    }
+
+    if (N(ItemChoice_HasSelectedItem)) {
+        N(ItemChoice_HasSelectedItem) = FALSE;
+        evt_set_variable(script, *args++, N(ItemChoice_SelectedItemID));
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}
+NOP_UNFIX
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
index 2c57961343..a3f3bd9a9c 100644
--- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
+++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
@@ -298,7 +298,7 @@ void N(appendGfx_piranha_vines)(void* data) {
             vtx->tc[0] = j * 0x140;
             vtx->tc[1] = 0;
             vtx->cn[0] = j * 50;
-            vtx->cn[1] = j * 120;;
+            vtx->cn[1] = j * 120;
             vtx->cn[2] = j * 30;
             vtx++;
 
@@ -308,7 +308,7 @@ void N(appendGfx_piranha_vines)(void* data) {
             vtx->tc[0] = j * 0x140;
             vtx->tc[1] = 0x400;
             vtx->cn[0] = j * 50;
-            vtx->cn[1] = j * 120;;
+            vtx->cn[1] = j * 120;
             vtx->cn[2] = j * 30;
             vtx++;
         }
diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c
index d14d75f086..04f52762f3 100644
--- a/src/world/script_api/7E0E80.c
+++ b/src/world/script_api/7E0E80.c
@@ -357,13 +357,17 @@ ApiStatus ShowShopPurchaseDialog(Evt* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
+void func_800F4FC4(PopupMenu* popup);
+
 // almost
 #ifdef NON_EQUIVALENT
 void shop_open_item_select_popup(s32 mode) {
     PopupMenu* menu = &gGameStatusPtr->mapShop->itemSelectMenu;
     s32 numItemSlots;
     s32 popupType;
+    s32 enabled;
     s32 numEntries;
+    s32 itemID;
     s32 i;
 
     switch (mode) {
@@ -381,30 +385,31 @@ void shop_open_item_select_popup(s32 mode) {
             break;
     }
 
+    enabled = TRUE;
     numEntries = 0;
 
     for (i = 0; i < numItemSlots; i++) {
-        s32 itemID;
+        do {
+            switch (mode) {
+                case 0:
+                case 1:
+                    itemID = gPlayerData.invItems[i];
+                    break;
+                default:
+                    itemID = gPlayerData.storedItems[i];
+                    break;
+            }
 
-        switch (mode) {
-            case 0:
-            case 1:
-                itemID = gPlayerData.invItems[i];
-                break;
-            default:
-                itemID = gPlayerData.storedItems[i];
-                break;
-        }
-
-        if (itemID != ITEM_NONE) {
-            menu->ptrIcon[numEntries] = gItemHudScripts[gItemTable[itemID].hudElemID].enabled;
-            menu->userIndex[numEntries] = i;
-            menu->enabled[numEntries] = TRUE;
-            menu->nameMsg[numEntries] = gItemTable[itemID].nameMsg;
-            menu->descMsg[numEntries] = gItemTable[itemID].shortDescMsg;
-            menu->value[numEntries] = shop_get_sell_price(itemID);
-            numEntries++;
-        }
+            if (itemID != ITEM_NONE) {
+                menu->ptrIcon[numEntries] = gItemHudScripts[gItemTable[itemID].hudElemID].enabled;
+                menu->userIndex[numEntries] = i;
+                menu->enabled[numEntries] = enabled;
+                menu->nameMsg[numEntries] = gItemTable[itemID].nameMsg;
+                menu->descMsg[numEntries] = gItemTable[itemID].shortDescMsg;
+                menu->value[numEntries] = shop_get_sell_price(itemID);
+                numEntries++;
+            }
+        } while (0); // TODO required to match
     }
 
     menu->popupType = popupType;
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 1fb7b4c4e8..de54c78991 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
@@ -21,7 +21,7 @@ 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, 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
+.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, hos_06_ItemChoice_WaitForSelection, 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
@@ -30,7 +30,7 @@ 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, 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
+.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, hos_06_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024321C_A3C6FC
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802431AC_A3C68C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80242C0C_A3C0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_LetterDelivery_RestoreNpcAnim, 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 a2c303fd9c..1d9c77cc49 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
@@ -12,7 +12,7 @@ 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, 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
+.word 0x00000043, 0x00000002, func_80241008_A3A4E8, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D8_A3DAB8, 0x00000010, 0x00000000, hos_06_D_80246430, 0x00000000, 0x00000001, 0x00000043, 0x00000002, dup_hos_06_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel dup_hos_06_varStash
 .word 0x00000000
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 1daffe855f..173eb14cbf 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
@@ -21,7 +21,7 @@ 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, 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
+.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, jan_02_ItemChoice_WaitForSelection, 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 039a7c4f69..c2c190bac7 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
@@ -132,13 +132,13 @@ 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, 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
+.word 0x00000043, 0x00000002, func_80241A64_B36634, 0xFE363C80, 0x0000004E, 0x00000006, D_8024744C_B3C01C, 0x00000010, 0x00000000, D_8024FBA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, jan_03_ItemChoice_WaitForSelection, 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, 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
+.word 0x00000043, 0x00000002, func_80241B00_B366D0, 0xFE363C80, 0x0000004E, 0x00000006, D_802475E0_B3C1B0, 0x00000010, 0x00000000, D_8024FD68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, jan_03_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel jan_03_varStash
 .word 0x00000000
@@ -219,7 +219,7 @@ 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, 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
+.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, jan_03_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A1A0_B3ED70
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_03_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024A130_B3ED00, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_03_LetterDelivery_RestoreNpcAnim, 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 ab43ab0f93..5af541aed6 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
@@ -9,10 +9,10 @@ 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, 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
+.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, kkj_18_ItemChoice_WaitForSelection, 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, 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
+.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, kkj_18_ItemChoice_WaitForSelection, 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 5e8c80e7df..2fadadbc24 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
@@ -9,10 +9,10 @@ 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, 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
+.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, kkj_19_ItemChoice_WaitForSelection, 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, 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
+.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, kkj_19_ItemChoice_WaitForSelection, 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_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
index ce61d97f2e..e94bfb36b1 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
@@ -183,7 +183,7 @@ 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, 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
+.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, nok_01_ItemChoice_WaitForSelection, 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
@@ -192,7 +192,7 @@ 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, 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
+.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, nok_01_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248B1C_9CDEFC
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_01_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80248AAC_9CDE8C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_01_LetterDelivery_RestoreNpcAnim, 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 998ff3ccfc..3c8fd196d7 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
@@ -18,7 +18,7 @@ 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, 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
+.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, nok_02_ItemChoice_WaitForSelection, 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 0ae4df3d1b..76f11331c3 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
@@ -120,7 +120,7 @@ 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, 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
+.word 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_802496F8_9E0718, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, dup_nok_02_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024988C_9E08AC
 .word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -132,7 +132,7 @@ 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, 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
+.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, dup_nok_02_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80249CE8_9E0D08
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80249C78_9E0C98, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_02_LetterDelivery_RestoreNpcAnim, 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 eb171c8733..04e2115a07 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
@@ -12,13 +12,13 @@ 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, 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
+.word 0x00000043, 0x00000002, func_80243C78_9DAC98, 0xFE363C80, 0x0000004E, 0x00000006, D_80252408_9E9428, 0x00000010, 0x00000000, nok_02_D_80254BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, dup2_nok_02_ItemChoice_WaitForSelection, 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, 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
+.word 0x00000043, 0x00000002, func_80243D14_9DAD34, 0xFE363C80, 0x0000004E, 0x00000006, D_8025259C_9E95BC, 0x00000010, 0x00000000, nok_02_D_80254D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, dup2_nok_02_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel dup2_nok_02_varStash
 .word 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 d6a9c3bcf0..b8e57673b4 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
@@ -33,7 +33,7 @@ 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, 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
+.word 0x00000043, 0x00000002, func_80240F8C_DE341C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241C0C_DE409C, 0x00000010, 0x00000000, omo_13_80243220, 0x00000000, 0x00000001, 0x00000043, 0x00000002, omo_13_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241D90_DE4220
 .word 0x000000D0, 0xFFFFFFFF
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 c24424339b..44dd5aa29c 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
@@ -12,10 +12,10 @@ 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, 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
+.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, pra_01_ItemChoice_WaitForSelection, 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, 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
+.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, pra_01_ItemChoice_WaitForSelection, 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 6e55382ec1..a0b853d074 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
@@ -12,7 +12,7 @@ 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, 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
+.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, pra_02_ItemChoice_WaitForSelection, 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, 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, pra_02_80243E88, 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, pra_02_80243E88, 0x00000000, 0x00000001, 0x00000043, 0x00000002, pra_02_ItemChoice_WaitForSelection, 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 2228e3a1b4..21ec9001ed 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
@@ -39,10 +39,10 @@ dlabel pra_09_ItemChoice_SelectedItemID
 .word 0x00000000
 
 dlabel D_80241DA0_D5A630
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, pra_09_80246A20, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802411D8_D59A68, 0xFE363C80, 0x0000004E, 0x00000006, D_80241DA0_D5A630, 0x00000010, 0x00000000, pra_09_80246A20, 0x00000000, 0x00000001, 0x00000043, 0x00000002, pra_09_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241F34_D5A7C4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, pra_09_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, pra_09_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241274_D59B04, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F34_D5A7C4, 0x00000010, 0x00000000, D_80246BE8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024114C_D599DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.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, pra_09_ItemChoice_WaitForSelection, 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 3cbd80ae63..cd91e39ead 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
@@ -12,10 +12,10 @@ 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, 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
+.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, pra_13_ItemChoice_WaitForSelection, 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, 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
+.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, pra_13_ItemChoice_WaitForSelection, 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 5e51afa71e..6e439655e4 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
@@ -24,10 +24,10 @@ 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, 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
+.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, pra_19_ItemChoice_WaitForSelection, 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, 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
+.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, pra_19_ItemChoice_WaitForSelection, 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 6964c8bcd7..336d042526 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
@@ -15,10 +15,10 @@ 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, 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
+.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, pra_31_ItemChoice_WaitForSelection, 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, 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
+.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, pra_31_ItemChoice_WaitForSelection, 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 6b733f08d8..665a08ba83 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
@@ -90,10 +90,10 @@ 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, 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
+.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, sam_01_ItemChoice_WaitForSelection, 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, 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
+.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, sam_01_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel sam_01_varStash
 .word 0x00000000
@@ -186,7 +186,7 @@ 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, 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
+.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, sam_01_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802460D4_CFDC44
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_01_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80246064_CFDBD4, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_01_LetterDelivery_RestoreNpcAnim, 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 c7e1c8b19f..eccb98d520 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
@@ -12,10 +12,10 @@ 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, 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
+.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, sam_04_ItemChoice_WaitForSelection, 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, 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
+.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, sam_04_ItemChoice_WaitForSelection, 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 5fd39c0acc..b023275821 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
@@ -63,10 +63,10 @@ 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, 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
+.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, sam_06_ItemChoice_WaitForSelection, 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, 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
+.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, sam_06_ItemChoice_WaitForSelection, 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
@@ -147,7 +147,7 @@ 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, 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
+.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, sam_06_ItemChoice_WaitForSelection, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247250_D270E0
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_06_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802471E0_D27070, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802443D4_D24264, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_06_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000
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
deleted file mode 100644
index 95948784fb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240654_A39B34
-/* A39B34 80240654 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(hos_06_ItemChoice_HasSelectedItem)
-/* A39B48 80240668 AC202C6C */  sw        $zero, %lo(hos_06_ItemChoice_HasSelectedItem)($at)
-.L8024066C:
-/* 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)
-/* A39B60 80240680 080901A7 */  j         .L8024069C
-/* A39B64 80240684 0000102D */   daddu    $v0, $zero, $zero
-.L80240688:
-/* A39B68 80240688 8CC50000 */  lw        $a1, ($a2)
-/* A39B6C 8024068C 3C068024 */  lui       $a2, %hi(hos_06_ItemChoice_SelectedItemID)
-/* A39B70 80240690 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* A39B80 802406A0 03E00008 */  jr        $ra
-/* A39B84 802406A4 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
deleted file mode 100644
index 0b434bc864..0000000000
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F7C_A3A45C
-/* A3A45C 80240F7C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(dup_hos_06_ItemChoice_HasSelectedItem)
-/* A3A470 80240F90 AC2045D0 */  sw        $zero, %lo(dup_hos_06_ItemChoice_HasSelectedItem)($at)
-.L80240F94:
-/* 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)
-/* A3A488 80240FA8 080903F1 */  j         .L80240FC4
-/* A3A48C 80240FAC 0000102D */   daddu    $v0, $zero, $zero
-.L80240FB0:
-/* A3A490 80240FB0 8CC50000 */  lw        $a1, ($a2)
-/* A3A494 80240FB4 3C068024 */  lui       $a2, %hi(dup_hos_06_ItemChoice_SelectedItemID)
-/* A3A498 80240FB8 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* A3A4A8 80240FC8 03E00008 */  jr        $ra
-/* A3A4AC 80240FCC 27BD0018 */   addiu    $sp, $sp, 0x18
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
deleted file mode 100644
index a2fb6b2ab3..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802414EC_B2D95C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802414EC_B2D95C
-/* B2D95C 802414EC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(jan_02_ItemChoice_HasSelectedItem)
-/* B2D970 80241500 AC203048 */  sw        $zero, %lo(jan_02_ItemChoice_HasSelectedItem)($at)
-.L80241504:
-/* 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)
-/* B2D988 80241518 0809054D */  j         .L80241534
-/* B2D98C 8024151C 0000102D */   daddu    $v0, $zero, $zero
-.L80241520:
-/* B2D990 80241520 8CC50000 */  lw        $a1, ($a2)
-/* B2D994 80241524 3C068024 */  lui       $a2, %hi(jan_02_ItemChoice_SelectedItemID)
-/* B2D998 80241528 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* B2D9A8 80241538 03E00008 */  jr        $ra
-/* B2D9AC 8024153C 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
deleted file mode 100644
index 1ac6e16a52..0000000000
--- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802419D8_B365A8
-/* B365A8 802419D8 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(jan_03_ItemChoice_HasSelectedItem)
-/* B365BC 802419EC AC207444 */  sw        $zero, %lo(jan_03_ItemChoice_HasSelectedItem)($at)
-.L802419F0:
-/* 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)
-/* B365D4 80241A04 08090688 */  j         .L80241A20
-/* B365D8 80241A08 0000102D */   daddu    $v0, $zero, $zero
-.L80241A0C:
-/* B365DC 80241A0C 8CC50000 */  lw        $a1, ($a2)
-/* B365E0 80241A10 3C068024 */  lui       $a2, %hi(jan_03_ItemChoice_SelectedItemID)
-/* B365E4 80241A14 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* B365F4 80241A24 03E00008 */  jr        $ra
-/* B365F8 80241A28 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
deleted file mode 100644
index de5fc2ab7e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s
+++ /dev/null
@@ -1,181 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80244FA0_ADAE70
-.double 0.1
-
-dlabel D_80244FA8_ADAE78
-.double 1.3
-
-dlabel D_80244FB0_ADAE80
-.double 0.4
-
-dlabel D_80244FB8_ADAE88
-.double 0.2
-
-.section .text
-
-glabel func_802404E0_AD63B0
-/* AD63B0 802404E0 27BDFFA8 */  addiu     $sp, $sp, -0x58
-/* AD63B4 802404E4 F7BC0050 */  sdc1      $f28, 0x50($sp)
-/* AD63B8 802404E8 3C018024 */  lui       $at, %hi(D_80244FA0_ADAE70)
-/* AD63BC 802404EC D43C4FA0 */  ldc1      $f28, %lo(D_80244FA0_ADAE70)($at)
-/* AD63C0 802404F0 AFB20020 */  sw        $s2, 0x20($sp)
-/* AD63C4 802404F4 0000902D */  daddu     $s2, $zero, $zero
-/* AD63C8 802404F8 AFB30024 */  sw        $s3, 0x24($sp)
-/* AD63CC 802404FC 0240982D */  daddu     $s3, $s2, $zero
-/* AD63D0 80240500 AFB1001C */  sw        $s1, 0x1c($sp)
-/* AD63D4 80240504 3C118024 */  lui       $s1, %hi(D_80243614_AD94E4)
-/* AD63D8 80240508 26313614 */  addiu     $s1, $s1, %lo(D_80243614_AD94E4)
-/* AD63DC 8024050C AFBF0028 */  sw        $ra, 0x28($sp)
-/* AD63E0 80240510 AFB00018 */  sw        $s0, 0x18($sp)
-/* AD63E4 80240514 F7BA0048 */  sdc1      $f26, 0x48($sp)
-/* AD63E8 80240518 F7B80040 */  sdc1      $f24, 0x40($sp)
-/* AD63EC 8024051C F7B60038 */  sdc1      $f22, 0x38($sp)
-/* AD63F0 80240520 F7B40030 */  sdc1      $f20, 0x30($sp)
-.L80240524:
-/* AD63F4 80240524 86220002 */  lh        $v0, 2($s1)
-/* AD63F8 80240528 32500001 */  andi      $s0, $s2, 1
-/* AD63FC 8024052C 44826000 */  mtc1      $v0, $f12
-/* AD6400 80240530 00000000 */  nop
-/* AD6404 80240534 46806320 */  cvt.s.w   $f12, $f12
-/* AD6408 80240538 86220000 */  lh        $v0, ($s1)
-/* AD640C 8024053C 4482A000 */  mtc1      $v0, $f20
-/* AD6410 80240540 00000000 */  nop
-/* AD6414 80240544 4680A520 */  cvt.s.w   $f20, $f20
-/* AD6418 80240548 0C00A8D4 */  jal       cos_deg
-/* AD641C 8024054C 26100002 */   addiu    $s0, $s0, 2
-/* AD6420 80240550 4600A002 */  mul.s     $f0, $f20, $f0
-/* AD6424 80240554 00000000 */  nop
-/* AD6428 80240558 3C018024 */  lui       $at, %hi(D_80244FA8_ADAE78)
-/* AD642C 8024055C D4224FA8 */  ldc1      $f2, %lo(D_80244FA8_ADAE78)($at)
-/* AD6430 80240560 46000021 */  cvt.d.s   $f0, $f0
-/* AD6434 80240564 46220002 */  mul.d     $f0, $f0, $f2
-/* AD6438 80240568 00000000 */  nop
-/* AD643C 8024056C 86220002 */  lh        $v0, 2($s1)
-/* AD6440 80240570 44826000 */  mtc1      $v0, $f12
-/* AD6444 80240574 00000000 */  nop
-/* AD6448 80240578 46806320 */  cvt.s.w   $f12, $f12
-/* AD644C 8024057C 0C00A8BB */  jal       sin_deg
-/* AD6450 80240580 46200620 */   cvt.s.d  $f24, $f0
-/* AD6454 80240584 4600A002 */  mul.s     $f0, $f20, $f0
-/* AD6458 80240588 00000000 */  nop
-/* AD645C 8024058C 3C013FF8 */  lui       $at, 0x3ff8
-/* AD6460 80240590 44811800 */  mtc1      $at, $f3
-/* AD6464 80240594 44801000 */  mtc1      $zero, $f2
-/* AD6468 80240598 46000021 */  cvt.d.s   $f0, $f0
-/* AD646C 8024059C 46220002 */  mul.d     $f0, $f0, $f2
-/* AD6470 802405A0 00000000 */  nop
-/* AD6474 802405A4 4600C0A1 */  cvt.d.s   $f2, $f24
-/* AD6478 802405A8 463C1082 */  mul.d     $f2, $f2, $f28
-/* AD647C 802405AC 00000000 */  nop
-/* AD6480 802405B0 462006A0 */  cvt.s.d   $f26, $f0
-/* AD6484 802405B4 4600D021 */  cvt.d.s   $f0, $f26
-/* AD6488 802405B8 463C0002 */  mul.d     $f0, $f0, $f28
-/* AD648C 802405BC 00000000 */  nop
-/* AD6490 802405C0 3C014170 */  lui       $at, 0x4170
-/* AD6494 802405C4 44816000 */  mtc1      $at, $f12
-/* AD6498 802405C8 00000000 */  nop
-/* AD649C 802405CC 460CA302 */  mul.s     $f12, $f20, $f12
-/* AD64A0 802405D0 00000000 */  nop
-/* AD64A4 802405D4 3C014416 */  lui       $at, 0x4416
-/* AD64A8 802405D8 4481B000 */  mtc1      $at, $f22
-/* AD64AC 802405DC 00000000 */  nop
-/* AD64B0 802405E0 4616C580 */  add.s     $f22, $f24, $f22
-/* AD64B4 802405E4 3C0142C8 */  lui       $at, 0x42c8
-/* AD64B8 802405E8 4481A000 */  mtc1      $at, $f20
-/* AD64BC 802405EC 46201620 */  cvt.s.d   $f24, $f2
-/* AD64C0 802405F0 4614D500 */  add.s     $f20, $f26, $f20
-/* AD64C4 802405F4 0C00A8D4 */  jal       cos_deg
-/* AD64C8 802405F8 462006A0 */   cvt.s.d  $f26, $f0
-/* AD64CC 802405FC 32420003 */  andi      $v0, $s2, 3
-/* AD64D0 80240600 3C018024 */  lui       $at, %hi(D_80244FB0_ADAE80)
-/* AD64D4 80240604 D4244FB0 */  ldc1      $f4, %lo(D_80244FB0_ADAE80)($at)
-/* AD64D8 80240608 44821000 */  mtc1      $v0, $f2
-/* AD64DC 8024060C 00000000 */  nop
-/* AD64E0 80240610 468010A1 */  cvt.d.w   $f2, $f2
-/* AD64E4 80240614 46241082 */  mul.d     $f2, $f2, $f4
-/* AD64E8 80240618 00000000 */  nop
-/* AD64EC 8024061C 3C0140A0 */  lui       $at, 0x40a0
-/* AD64F0 80240620 44812000 */  mtc1      $at, $f4
-/* AD64F4 80240624 00000000 */  nop
-/* AD64F8 80240628 46040002 */  mul.s     $f0, $f0, $f4
-/* AD64FC 8024062C 00000000 */  nop
-/* AD6500 80240630 0200202D */  daddu     $a0, $s0, $zero
-/* AD6504 80240634 00021080 */  sll       $v0, $v0, 2
-/* AD6508 80240638 4405B000 */  mfc1      $a1, $f22
-/* AD650C 8024063C 4406A000 */  mfc1      $a2, $f20
-/* AD6510 80240640 4600C600 */  add.s     $f24, $f24, $f0
-/* AD6514 80240644 3C013FF0 */  lui       $at, 0x3ff0
-/* AD6518 80240648 44810800 */  mtc1      $at, $f1
-/* AD651C 8024064C 44800000 */  mtc1      $zero, $f0
-/* AD6520 80240650 3C07C316 */  lui       $a3, 0xc316
-/* AD6524 80240654 46201080 */  add.d     $f2, $f2, $f0
-/* AD6528 80240658 2442001E */  addiu     $v0, $v0, 0x1e
-/* AD652C 8024065C AFA20014 */  sw        $v0, 0x14($sp)
-/* AD6530 80240660 462010A0 */  cvt.s.d   $f2, $f2
-/* AD6534 80240664 0C01C994 */  jal       fx_ice_shard
-/* AD6538 80240668 E7A20010 */   swc1     $f2, 0x10($sp)
-/* AD653C 8024066C 0040802D */  daddu     $s0, $v0, $zero
-/* AD6540 80240670 8E02000C */  lw        $v0, 0xc($s0)
-/* AD6544 80240674 2404000A */  addiu     $a0, $zero, 0xa
-/* AD6548 80240678 0C00A67F */  jal       rand_int
-/* AD654C 8024067C AC400044 */   sw       $zero, 0x44($v0)
-/* AD6550 80240680 3C018024 */  lui       $at, %hi(D_80244FB8_ADAE88)
-/* AD6554 80240684 D4224FB8 */  ldc1      $f2, %lo(D_80244FB8_ADAE88)($at)
-/* AD6558 80240688 44820000 */  mtc1      $v0, $f0
-/* AD655C 8024068C 00000000 */  nop
-/* AD6560 80240690 46800021 */  cvt.d.w   $f0, $f0
-/* AD6564 80240694 46220002 */  mul.d     $f0, $f0, $f2
-/* AD6568 80240698 00000000 */  nop
-/* AD656C 8024069C 463C0000 */  add.d     $f0, $f0, $f28
-/* AD6570 802406A0 2404000A */  addiu     $a0, $zero, 0xa
-/* AD6574 802406A4 8E02000C */  lw        $v0, 0xc($s0)
-/* AD6578 802406A8 46200020 */  cvt.s.d   $f0, $f0
-/* AD657C 802406AC E4400048 */  swc1      $f0, 0x48($v0)
-/* AD6580 802406B0 8E02000C */  lw        $v0, 0xc($s0)
-/* AD6584 802406B4 44930000 */  mtc1      $s3, $f0
-/* AD6588 802406B8 00000000 */  nop
-/* AD658C 802406BC 46800020 */  cvt.s.w   $f0, $f0
-/* AD6590 802406C0 0C00A67F */  jal       rand_int
-/* AD6594 802406C4 E440003C */   swc1     $f0, 0x3c($v0)
-/* AD6598 802406C8 2442FFFB */  addiu     $v0, $v0, -5
-/* AD659C 802406CC 8E03000C */  lw        $v1, 0xc($s0)
-/* AD65A0 802406D0 44820000 */  mtc1      $v0, $f0
-/* AD65A4 802406D4 00000000 */  nop
-/* AD65A8 802406D8 46800020 */  cvt.s.w   $f0, $f0
-/* AD65AC 802406DC E4600040 */  swc1      $f0, 0x40($v1)
-/* AD65B0 802406E0 8E02000C */  lw        $v0, 0xc($s0)
-/* AD65B4 802406E4 3C014000 */  lui       $at, 0x4000
-/* AD65B8 802406E8 44810000 */  mtc1      $at, $f0
-/* AD65BC 802406EC E458004C */  swc1      $f24, 0x4c($v0)
-/* AD65C0 802406F0 8E02000C */  lw        $v0, 0xc($s0)
-/* AD65C4 802406F4 26310004 */  addiu     $s1, $s1, 4
-/* AD65C8 802406F8 E45A0050 */  swc1      $f26, 0x50($v0)
-/* AD65CC 802406FC 8E02000C */  lw        $v0, 0xc($s0)
-/* AD65D0 80240700 26520001 */  addiu     $s2, $s2, 1
-/* AD65D4 80240704 E4400054 */  swc1      $f0, 0x54($v0)
-/* AD65D8 80240708 8E02000C */  lw        $v0, 0xc($s0)
-/* AD65DC 8024070C 3C01BDCC */  lui       $at, 0xbdcc
-/* AD65E0 80240710 3421CCCD */  ori       $at, $at, 0xcccd
-/* AD65E4 80240714 44810000 */  mtc1      $at, $f0
-/* AD65E8 80240718 00000000 */  nop
-/* AD65EC 8024071C E4400058 */  swc1      $f0, 0x58($v0)
-/* AD65F0 80240720 2A42001C */  slti      $v0, $s2, 0x1c
-/* AD65F4 80240724 1440FF7F */  bnez      $v0, .L80240524
-/* AD65F8 80240728 26730023 */   addiu    $s3, $s3, 0x23
-/* AD65FC 8024072C 8FBF0028 */  lw        $ra, 0x28($sp)
-/* AD6600 80240730 8FB30024 */  lw        $s3, 0x24($sp)
-/* AD6604 80240734 8FB20020 */  lw        $s2, 0x20($sp)
-/* AD6608 80240738 8FB1001C */  lw        $s1, 0x1c($sp)
-/* AD660C 8024073C 8FB00018 */  lw        $s0, 0x18($sp)
-/* AD6610 80240740 D7BC0050 */  ldc1      $f28, 0x50($sp)
-/* AD6614 80240744 D7BA0048 */  ldc1      $f26, 0x48($sp)
-/* AD6618 80240748 D7B80040 */  ldc1      $f24, 0x40($sp)
-/* AD661C 8024074C D7B60038 */  ldc1      $f22, 0x38($sp)
-/* AD6620 80240750 D7B40030 */  ldc1      $f20, 0x30($sp)
-/* AD6624 80240754 24020002 */  addiu     $v0, $zero, 2
-/* AD6628 80240758 03E00008 */  jr        $ra
-/* AD662C 8024075C 27BD0058 */   addiu    $sp, $sp, 0x58
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
deleted file mode 100644
index c4f690b64d..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024056C_AF320C
-/* AF320C 8024056C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(kkj_18_ItemChoice_HasSelectedItem)
-/* AF3220 80240580 AC201F10 */  sw        $zero, %lo(kkj_18_ItemChoice_HasSelectedItem)($at)
-.L80240584:
-/* 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)
-/* AF3238 80240598 0809016D */  j         .L802405B4
-/* AF323C 8024059C 0000102D */   daddu    $v0, $zero, $zero
-.L802405A0:
-/* AF3240 802405A0 8CC50000 */  lw        $a1, ($a2)
-/* AF3244 802405A4 3C068024 */  lui       $a2, %hi(kkj_18_ItemChoice_SelectedItemID)
-/* AF3248 802405A8 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* AF3258 802405B8 03E00008 */  jr        $ra
-/* AF325C 802405BC 27BD0018 */   addiu    $sp, $sp, 0x18
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
deleted file mode 100644
index e630a3faf1..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802404DC_AF7E2C
-/* AF7E2C 802404DC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(kkj_19_ItemChoice_HasSelectedItem)
-/* AF7E40 802404F0 AC201B10 */  sw        $zero, %lo(kkj_19_ItemChoice_HasSelectedItem)($at)
-.L802404F4:
-/* 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)
-/* AF7E58 80240508 08090149 */  j         .L80240524
-/* AF7E5C 8024050C 0000102D */   daddu    $v0, $zero, $zero
-.L80240510:
-/* AF7E60 80240510 8CC50000 */  lw        $a1, ($a2)
-/* AF7E64 80240514 3C068024 */  lui       $a2, %hi(kkj_19_ItemChoice_SelectedItemID)
-/* AF7E68 80240518 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* AF7E78 80240528 03E00008 */  jr        $ra
-/* AF7E7C 8024052C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s
deleted file mode 100644
index baf4e56341..0000000000
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s
+++ /dev/null
@@ -1,163 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024295C_8B29CC
-/* 8B29CC 8024295C 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 8B29D0 80242960 AFB20018 */  sw        $s2, 0x18($sp)
-/* 8B29D4 80242964 0080902D */  daddu     $s2, $a0, $zero
-/* 8B29D8 80242968 AFB10014 */  sw        $s1, 0x14($sp)
-/* 8B29DC 8024296C 00A0882D */  daddu     $s1, $a1, $zero
-/* 8B29E0 80242970 AFBF002C */  sw        $ra, 0x2c($sp)
-/* 8B29E4 80242974 AFB60028 */  sw        $s6, 0x28($sp)
-/* 8B29E8 80242978 AFB50024 */  sw        $s5, 0x24($sp)
-/* 8B29EC 8024297C AFB40020 */  sw        $s4, 0x20($sp)
-/* 8B29F0 80242980 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 8B29F4 80242984 AFB00010 */  sw        $s0, 0x10($sp)
-/* 8B29F8 80242988 8E50000C */  lw        $s0, 0xc($s2)
-/* 8B29FC 8024298C 8E050000 */  lw        $a1, ($s0)
-/* 8B2A00 80242990 0C0B1EAF */  jal       evt_get_variable
-/* 8B2A04 80242994 26100004 */   addiu    $s0, $s0, 4
-/* 8B2A08 80242998 8E050000 */  lw        $a1, ($s0)
-/* 8B2A0C 8024299C 26100004 */  addiu     $s0, $s0, 4
-/* 8B2A10 802429A0 0240202D */  daddu     $a0, $s2, $zero
-/* 8B2A14 802429A4 0C0B1EAF */  jal       evt_get_variable
-/* 8B2A18 802429A8 0040B02D */   daddu    $s6, $v0, $zero
-/* 8B2A1C 802429AC 8E050000 */  lw        $a1, ($s0)
-/* 8B2A20 802429B0 26100004 */  addiu     $s0, $s0, 4
-/* 8B2A24 802429B4 0240202D */  daddu     $a0, $s2, $zero
-/* 8B2A28 802429B8 0C0B1EAF */  jal       evt_get_variable
-/* 8B2A2C 802429BC 0040A02D */   daddu    $s4, $v0, $zero
-/* 8B2A30 802429C0 8E050000 */  lw        $a1, ($s0)
-/* 8B2A34 802429C4 26100004 */  addiu     $s0, $s0, 4
-/* 8B2A38 802429C8 0240202D */  daddu     $a0, $s2, $zero
-/* 8B2A3C 802429CC 0C0B1EAF */  jal       evt_get_variable
-/* 8B2A40 802429D0 0040982D */   daddu    $s3, $v0, $zero
-/* 8B2A44 802429D4 0240202D */  daddu     $a0, $s2, $zero
-/* 8B2A48 802429D8 8E050000 */  lw        $a1, ($s0)
-/* 8B2A4C 802429DC 0C0B1EAF */  jal       evt_get_variable
-/* 8B2A50 802429E0 0040A82D */   daddu    $s5, $v0, $zero
-/* 8B2A54 802429E4 1220000B */  beqz      $s1, .L80242A14
-/* 8B2A58 802429E8 0040802D */   daddu    $s0, $v0, $zero
-/* 8B2A5C 802429EC 3C048025 */  lui       $a0, %hi(kmr_02_savedColR)
-/* 8B2A60 802429F0 24847F20 */  addiu     $a0, $a0, %lo(kmr_02_savedColR)
-/* 8B2A64 802429F4 3C058025 */  lui       $a1, %hi(kmr_02_savedColG)
-/* 8B2A68 802429F8 24A57F21 */  addiu     $a1, $a1, %lo(kmr_02_savedColG)
-/* 8B2A6C 802429FC 3C068025 */  lui       $a2, %hi(kmr_02_savedColB)
-/* 8B2A70 80242A00 24C67F22 */  addiu     $a2, $a2, %lo(kmr_02_savedColB)
-/* 8B2A74 80242A04 3C078025 */  lui       $a3, %hi(kmr_02_savedColA)
-/* 8B2A78 80242A08 0C046FA0 */  jal       get_background_color_blend
-/* 8B2A7C 80242A0C 24E77F23 */   addiu    $a3, $a3, %lo(kmr_02_savedColA)
-/* 8B2A80 80242A10 AE400070 */  sw        $zero, 0x70($s2)
-.L80242A14:
-/* 8B2A84 80242A14 1A000053 */  blez      $s0, .L80242B64
-/* 8B2A88 80242A18 32C400FF */   andi     $a0, $s6, 0xff
-/* 8B2A8C 80242A1C 3C048025 */  lui       $a0, %hi(kmr_02_savedColR)
-/* 8B2A90 80242A20 90847F20 */  lbu       $a0, %lo(kmr_02_savedColR)($a0)
-/* 8B2A94 80242A24 8E430070 */  lw        $v1, 0x70($s2)
-/* 8B2A98 80242A28 02C41023 */  subu      $v0, $s6, $a0
-/* 8B2A9C 80242A2C 00430018 */  mult      $v0, $v1
-/* 8B2AA0 80242A30 00004012 */  mflo      $t0
-/* 8B2AA4 80242A34 00000000 */  nop
-/* 8B2AA8 80242A38 16000002 */  bnez      $s0, .L80242A44
-/* 8B2AAC 80242A3C 0110001A */   div      $zero, $t0, $s0
-/* 8B2AB0 80242A40 0007000D */  break     7
-.L80242A44:
-/* 8B2AB4 80242A44 2401FFFF */   addiu    $at, $zero, -1
-/* 8B2AB8 80242A48 16010004 */  bne       $s0, $at, .L80242A5C
-/* 8B2ABC 80242A4C 3C018000 */   lui      $at, 0x8000
-/* 8B2AC0 80242A50 15010002 */  bne       $t0, $at, .L80242A5C
-/* 8B2AC4 80242A54 00000000 */   nop
-/* 8B2AC8 80242A58 0006000D */  break     6
-.L80242A5C:
-/* 8B2ACC 80242A5C 00005012 */   mflo     $t2
-/* 8B2AD0 80242A60 3C058025 */  lui       $a1, %hi(kmr_02_savedColG)
-/* 8B2AD4 80242A64 90A57F21 */  lbu       $a1, %lo(kmr_02_savedColG)($a1)
-/* 8B2AD8 80242A68 02851023 */  subu      $v0, $s4, $a1
-/* 8B2ADC 80242A6C 00430018 */  mult      $v0, $v1
-/* 8B2AE0 80242A70 00004012 */  mflo      $t0
-/* 8B2AE4 80242A74 00000000 */  nop
-/* 8B2AE8 80242A78 16000002 */  bnez      $s0, .L80242A84
-/* 8B2AEC 80242A7C 0110001A */   div      $zero, $t0, $s0
-/* 8B2AF0 80242A80 0007000D */  break     7
-.L80242A84:
-/* 8B2AF4 80242A84 2401FFFF */   addiu    $at, $zero, -1
-/* 8B2AF8 80242A88 16010004 */  bne       $s0, $at, .L80242A9C
-/* 8B2AFC 80242A8C 3C018000 */   lui      $at, 0x8000
-/* 8B2B00 80242A90 15010002 */  bne       $t0, $at, .L80242A9C
-/* 8B2B04 80242A94 00000000 */   nop
-/* 8B2B08 80242A98 0006000D */  break     6
-.L80242A9C:
-/* 8B2B0C 80242A9C 00004812 */   mflo     $t1
-/* 8B2B10 80242AA0 3C068025 */  lui       $a2, %hi(kmr_02_savedColB)
-/* 8B2B14 80242AA4 90C67F22 */  lbu       $a2, %lo(kmr_02_savedColB)($a2)
-/* 8B2B18 80242AA8 02661023 */  subu      $v0, $s3, $a2
-/* 8B2B1C 80242AAC 00430018 */  mult      $v0, $v1
-/* 8B2B20 80242AB0 00004012 */  mflo      $t0
-/* 8B2B24 80242AB4 00000000 */  nop
-/* 8B2B28 80242AB8 16000002 */  bnez      $s0, .L80242AC4
-/* 8B2B2C 80242ABC 0110001A */   div      $zero, $t0, $s0
-/* 8B2B30 80242AC0 0007000D */  break     7
-.L80242AC4:
-/* 8B2B34 80242AC4 2401FFFF */   addiu    $at, $zero, -1
-/* 8B2B38 80242AC8 16010004 */  bne       $s0, $at, .L80242ADC
-/* 8B2B3C 80242ACC 3C018000 */   lui      $at, 0x8000
-/* 8B2B40 80242AD0 15010002 */  bne       $t0, $at, .L80242ADC
-/* 8B2B44 80242AD4 00000000 */   nop
-/* 8B2B48 80242AD8 0006000D */  break     6
-.L80242ADC:
-/* 8B2B4C 80242ADC 00004012 */   mflo     $t0
-/* 8B2B50 80242AE0 3C078025 */  lui       $a3, %hi(kmr_02_savedColA)
-/* 8B2B54 80242AE4 90E77F23 */  lbu       $a3, %lo(kmr_02_savedColA)($a3)
-/* 8B2B58 80242AE8 02A71023 */  subu      $v0, $s5, $a3
-/* 8B2B5C 80242AEC 00430018 */  mult      $v0, $v1
-/* 8B2B60 80242AF0 00001812 */  mflo      $v1
-/* 8B2B64 80242AF4 00000000 */  nop
-/* 8B2B68 80242AF8 16000002 */  bnez      $s0, .L80242B04
-/* 8B2B6C 80242AFC 0070001A */   div      $zero, $v1, $s0
-/* 8B2B70 80242B00 0007000D */  break     7
-.L80242B04:
-/* 8B2B74 80242B04 2401FFFF */   addiu    $at, $zero, -1
-/* 8B2B78 80242B08 16010004 */  bne       $s0, $at, .L80242B1C
-/* 8B2B7C 80242B0C 3C018000 */   lui      $at, 0x8000
-/* 8B2B80 80242B10 14610002 */  bne       $v1, $at, .L80242B1C
-/* 8B2B84 80242B14 00000000 */   nop
-/* 8B2B88 80242B18 0006000D */  break     6
-.L80242B1C:
-/* 8B2B8C 80242B1C 00001012 */   mflo     $v0
-/* 8B2B90 80242B20 008A2021 */  addu      $a0, $a0, $t2
-/* 8B2B94 80242B24 308400FF */  andi      $a0, $a0, 0xff
-/* 8B2B98 80242B28 00A92821 */  addu      $a1, $a1, $t1
-/* 8B2B9C 80242B2C 30A500FF */  andi      $a1, $a1, 0xff
-/* 8B2BA0 80242B30 00C83021 */  addu      $a2, $a2, $t0
-/* 8B2BA4 80242B34 30C600FF */  andi      $a2, $a2, 0xff
-/* 8B2BA8 80242B38 00E23821 */  addu      $a3, $a3, $v0
-/* 8B2BAC 80242B3C 0C046F97 */  jal       set_background_color_blend
-/* 8B2BB0 80242B40 30E700FF */   andi     $a3, $a3, 0xff
-/* 8B2BB4 80242B44 8E420070 */  lw        $v0, 0x70($s2)
-/* 8B2BB8 80242B48 24420001 */  addiu     $v0, $v0, 1
-/* 8B2BBC 80242B4C AE420070 */  sw        $v0, 0x70($s2)
-/* 8B2BC0 80242B50 0202102A */  slt       $v0, $s0, $v0
-/* 8B2BC4 80242B54 10400009 */  beqz      $v0, .L80242B7C
-/* 8B2BC8 80242B58 24020002 */   addiu    $v0, $zero, 2
-/* 8B2BCC 80242B5C 08090AE0 */  j         .L80242B80
-/* 8B2BD0 80242B60 00000000 */   nop
-.L80242B64:
-/* 8B2BD4 80242B64 328500FF */  andi      $a1, $s4, 0xff
-/* 8B2BD8 80242B68 326600FF */  andi      $a2, $s3, 0xff
-/* 8B2BDC 80242B6C 0C046F97 */  jal       set_background_color_blend
-/* 8B2BE0 80242B70 32A700FF */   andi     $a3, $s5, 0xff
-/* 8B2BE4 80242B74 08090AE0 */  j         .L80242B80
-/* 8B2BE8 80242B78 24020002 */   addiu    $v0, $zero, 2
-.L80242B7C:
-/* 8B2BEC 80242B7C 0000102D */  daddu     $v0, $zero, $zero
-.L80242B80:
-/* 8B2BF0 80242B80 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 8B2BF4 80242B84 8FB60028 */  lw        $s6, 0x28($sp)
-/* 8B2BF8 80242B88 8FB50024 */  lw        $s5, 0x24($sp)
-/* 8B2BFC 80242B8C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 8B2C00 80242B90 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 8B2C04 80242B94 8FB20018 */  lw        $s2, 0x18($sp)
-/* 8B2C08 80242B98 8FB10014 */  lw        $s1, 0x14($sp)
-/* 8B2C0C 80242B9C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 8B2C10 80242BA0 03E00008 */  jr        $ra
-/* 8B2C14 80242BA4 27BD0030 */   addiu    $sp, $sp, 0x30
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
deleted file mode 100644
index ae3dc5fb14..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242028_9C7408.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242028_9C7408
-/* 9C7408 80242028 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(nok_01_ItemChoice_HasSelectedItem)
-/* 9C741C 8024203C AC20856C */  sw        $zero, %lo(nok_01_ItemChoice_HasSelectedItem)($at)
-.L80242040:
-/* 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)
-/* 9C7434 80242054 0809081C */  j         .L80242070
-/* 9C7438 80242058 0000102D */   daddu    $v0, $zero, $zero
-.L8024205C:
-/* 9C743C 8024205C 8CC50000 */  lw        $a1, ($a2)
-/* 9C7440 80242060 3C068025 */  lui       $a2, %hi(nok_01_ItemChoice_SelectedItemID)
-/* 9C7444 80242064 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* 9C7454 80242074 03E00008 */  jr        $ra
-/* 9C7458 80242078 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
deleted file mode 100644
index da03d518de..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240624_9D7644
-/* 9D7644 80240624 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(nok_02_ItemChoice_HasSelectedItem)
-/* 9D7658 80240638 AC205434 */  sw        $zero, %lo(nok_02_ItemChoice_HasSelectedItem)($at)
-.L8024063C:
-/* 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)
-/* 9D7670 80240650 0809019B */  j         .L8024066C
-/* 9D7674 80240654 0000102D */   daddu    $v0, $zero, $zero
-.L80240658:
-/* 9D7678 80240658 8CC50000 */  lw        $a1, ($a2)
-/* 9D767C 8024065C 3C068024 */  lui       $a2, %hi(nok_02_ItemChoice_SelectedItemID)
-/* 9D7680 80240660 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* 9D7690 80240670 03E00008 */  jr        $ra
-/* 9D7694 80240674 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
deleted file mode 100644
index 1cb6f3e72f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80242BD0_9D9BF0
-/* 9D9BF0 80242BD0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(dup_nok_02_ItemChoice_HasSelectedItem)
-/* 9D9C04 80242BE4 AC2096F0 */  sw        $zero, %lo(dup_nok_02_ItemChoice_HasSelectedItem)($at)
-.L80242BE8:
-/* 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)
-/* 9D9C1C 80242BFC 08090B06 */  j         .L80242C18
-/* 9D9C20 80242C00 0000102D */   daddu    $v0, $zero, $zero
-.L80242C04:
-/* 9D9C24 80242C04 8CC50000 */  lw        $a1, ($a2)
-/* 9D9C28 80242C08 3C068025 */  lui       $a2, %hi(dup_nok_02_ItemChoice_SelectedItemID)
-/* 9D9C2C 80242C0C 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* 9D9C3C 80242C1C 03E00008 */  jr        $ra
-/* 9D9C40 80242C20 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
deleted file mode 100644
index d71e100ce7..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243BEC_9DAC0C
-/* 9DAC0C 80243BEC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(dup2_nok_02_ItemChoice_HasSelectedItem)
-/* 9DAC20 80243C00 AC202400 */  sw        $zero, %lo(dup2_nok_02_ItemChoice_HasSelectedItem)($at)
-.L80243C04:
-/* 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)
-/* 9DAC38 80243C18 08090F0D */  j         .L80243C34
-/* 9DAC3C 80243C1C 0000102D */   daddu    $v0, $zero, $zero
-.L80243C20:
-/* 9DAC40 80243C20 8CC50000 */  lw        $a1, ($a2)
-/* 9DAC44 80243C24 3C068025 */  lui       $a2, %hi(dup2_nok_02_ItemChoice_SelectedItemID)
-/* 9DAC48 80243C28 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* 9DAC58 80243C38 03E00008 */  jr        $ra
-/* 9DAC5C 80243C3C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s
deleted file mode 100644
index 11d935d722..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s
+++ /dev/null
@@ -1,103 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80243F10_9DAF30
-/* 9DAF30 80243F10 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 9DAF34 80243F14 AFB40020 */  sw        $s4, 0x20($sp)
-/* 9DAF38 80243F18 0080A02D */  daddu     $s4, $a0, $zero
-/* 9DAF3C 80243F1C AFB20018 */  sw        $s2, 0x18($sp)
-/* 9DAF40 80243F20 0000902D */  daddu     $s2, $zero, $zero
-/* 9DAF44 80243F24 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9DAF48 80243F28 3C138025 */  lui       $s3, %hi(D_80252784_9E97A4)
-/* 9DAF4C 80243F2C 26732784 */  addiu     $s3, $s3, %lo(D_80252784_9E97A4)
-/* 9DAF50 80243F30 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9DAF54 80243F34 0240882D */  daddu     $s1, $s2, $zero
-/* 9DAF58 80243F38 AFBF002C */  sw        $ra, 0x2c($sp)
-/* 9DAF5C 80243F3C AFB60028 */  sw        $s6, 0x28($sp)
-/* 9DAF60 80243F40 AFB50024 */  sw        $s5, 0x24($sp)
-/* 9DAF64 80243F44 AFB00010 */  sw        $s0, 0x10($sp)
-/* 9DAF68 80243F48 8E82000C */  lw        $v0, 0xc($s4)
-/* 9DAF6C 80243F4C 26700010 */  addiu     $s0, $s3, 0x10
-/* 9DAF70 80243F50 8C550000 */  lw        $s5, ($v0)
-.L80243F54:
-/* 9DAF74 80243F54 8E05FFFC */  lw        $a1, -4($s0)
-/* 9DAF78 80243F58 0C0B1EAF */  jal       evt_get_variable
-/* 9DAF7C 80243F5C 0280202D */   daddu    $a0, $s4, $zero
-/* 9DAF80 80243F60 5040000D */  beql      $v0, $zero, .L80243F98
-/* 9DAF84 80243F64 26310001 */   addiu    $s1, $s1, 1
-/* 9DAF88 80243F68 8E050004 */  lw        $a1, 4($s0)
-/* 9DAF8C 80243F6C 0C0B1EAF */  jal       evt_get_variable
-/* 9DAF90 80243F70 0280202D */   daddu    $a0, $s4, $zero
-/* 9DAF94 80243F74 54400008 */  bnel      $v0, $zero, .L80243F98
-/* 9DAF98 80243F78 26310001 */   addiu    $s1, $s1, 1
-/* 9DAF9C 80243F7C 26520001 */  addiu     $s2, $s2, 1
-/* 9DAFA0 80243F80 8E050000 */  lw        $a1, ($s0)
-/* 9DAFA4 80243F84 0C0B1EAF */  jal       evt_get_variable
-/* 9DAFA8 80243F88 0280202D */   daddu    $a0, $s4, $zero
-/* 9DAFAC 80243F8C 10400007 */  beqz      $v0, .L80243FAC
-/* 9DAFB0 80243F90 24020014 */   addiu    $v0, $zero, 0x14
-/* 9DAFB4 80243F94 26310001 */  addiu     $s1, $s1, 1
-.L80243F98:
-/* 9DAFB8 80243F98 2610001C */  addiu     $s0, $s0, 0x1c
-/* 9DAFBC 80243F9C 2E220014 */  sltiu     $v0, $s1, 0x14
-/* 9DAFC0 80243FA0 1440FFEC */  bnez      $v0, .L80243F54
-/* 9DAFC4 80243FA4 2673001C */   addiu    $s3, $s3, 0x1c
-/* 9DAFC8 80243FA8 24020014 */  addiu     $v0, $zero, 0x14
-.L80243FAC:
-/* 9DAFCC 80243FAC 16220021 */  bne       $s1, $v0, .L80244034
-/* 9DAFD0 80243FB0 0280202D */   daddu    $a0, $s4, $zero
-/* 9DAFD4 80243FB4 16400004 */  bnez      $s2, .L80243FC8
-/* 9DAFD8 80243FB8 02A0282D */   daddu    $a1, $s5, $zero
-/* 9DAFDC 80243FBC AE800084 */  sw        $zero, 0x84($s4)
-/* 9DAFE0 80243FC0 08091011 */  j         .L80244044
-/* 9DAFE4 80243FC4 240600FF */   addiu    $a2, $zero, 0xff
-.L80243FC8:
-/* 9DAFE8 80243FC8 0C00A67F */  jal       rand_int
-/* 9DAFEC 80243FCC 2644FFFF */   addiu    $a0, $s2, -1
-/* 9DAFF0 80243FD0 0040B02D */  daddu     $s6, $v0, $zero
-/* 9DAFF4 80243FD4 0000902D */  daddu     $s2, $zero, $zero
-/* 9DAFF8 80243FD8 3C138025 */  lui       $s3, %hi(D_80252784_9E97A4)
-/* 9DAFFC 80243FDC 26732784 */  addiu     $s3, $s3, %lo(D_80252784_9E97A4)
-/* 9DB000 80243FE0 0240882D */  daddu     $s1, $s2, $zero
-/* 9DB004 80243FE4 26700014 */  addiu     $s0, $s3, 0x14
-.L80243FE8:
-/* 9DB008 80243FE8 8E05FFF8 */  lw        $a1, -8($s0)
-/* 9DB00C 80243FEC 0C0B1EAF */  jal       evt_get_variable
-/* 9DB010 80243FF0 0280202D */   daddu    $a0, $s4, $zero
-/* 9DB014 80243FF4 5040000A */  beql      $v0, $zero, .L80244020
-/* 9DB018 80243FF8 26310001 */   addiu    $s1, $s1, 1
-/* 9DB01C 80243FFC 8E050000 */  lw        $a1, ($s0)
-/* 9DB020 80244000 0C0B1EAF */  jal       evt_get_variable
-/* 9DB024 80244004 0280202D */   daddu    $a0, $s4, $zero
-/* 9DB028 80244008 54400005 */  bnel      $v0, $zero, .L80244020
-/* 9DB02C 8024400C 26310001 */   addiu    $s1, $s1, 1
-/* 9DB030 80244010 0240102D */  daddu     $v0, $s2, $zero
-/* 9DB034 80244014 10560006 */  beq       $v0, $s6, .L80244030
-/* 9DB038 80244018 26520001 */   addiu    $s2, $s2, 1
-/* 9DB03C 8024401C 26310001 */  addiu     $s1, $s1, 1
-.L80244020:
-/* 9DB040 80244020 2610001C */  addiu     $s0, $s0, 0x1c
-/* 9DB044 80244024 2E220014 */  sltiu     $v0, $s1, 0x14
-/* 9DB048 80244028 1440FFEF */  bnez      $v0, .L80243FE8
-/* 9DB04C 8024402C 2673001C */   addiu    $s3, $s3, 0x1c
-.L80244030:
-/* 9DB050 80244030 0280202D */  daddu     $a0, $s4, $zero
-.L80244034:
-/* 9DB054 80244034 02A0282D */  daddu     $a1, $s5, $zero
-/* 9DB058 80244038 8E620000 */  lw        $v0, ($s3)
-/* 9DB05C 8024403C 26260001 */  addiu     $a2, $s1, 1
-/* 9DB060 80244040 AC820084 */  sw        $v0, 0x84($a0)
-.L80244044:
-/* 9DB064 80244044 0C0B2026 */  jal       evt_set_variable
-/* 9DB068 80244048 00000000 */   nop
-/* 9DB06C 8024404C 24020002 */  addiu     $v0, $zero, 2
-/* 9DB070 80244050 8FBF002C */  lw        $ra, 0x2c($sp)
-/* 9DB074 80244054 8FB60028 */  lw        $s6, 0x28($sp)
-/* 9DB078 80244058 8FB50024 */  lw        $s5, 0x24($sp)
-/* 9DB07C 8024405C 8FB40020 */  lw        $s4, 0x20($sp)
-/* 9DB080 80244060 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9DB084 80244064 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9DB088 80244068 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9DB08C 8024406C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9DB090 80244070 03E00008 */  jr        $ra
-/* 9DB094 80244074 27BD0030 */   addiu    $sp, $sp, 0x30
diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s
deleted file mode 100644
index 0fd53597ca..0000000000
--- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244078_9DB098.s
+++ /dev/null
@@ -1,120 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80244078_9DB098
-/* 9DB098 80244078 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 9DB09C 8024407C AFB40020 */  sw        $s4, 0x20($sp)
-/* 9DB0A0 80244080 0080A02D */  daddu     $s4, $a0, $zero
-/* 9DB0A4 80244084 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 9DB0A8 80244088 0000982D */  daddu     $s3, $zero, $zero
-/* 9DB0AC 8024408C AFB20018 */  sw        $s2, 0x18($sp)
-/* 9DB0B0 80244090 3C128025 */  lui       $s2, %hi(D_80252784_9E97A4)
-/* 9DB0B4 80244094 26522784 */  addiu     $s2, $s2, %lo(D_80252784_9E97A4)
-/* 9DB0B8 80244098 AFBF0030 */  sw        $ra, 0x30($sp)
-/* 9DB0BC 8024409C AFB7002C */  sw        $s7, 0x2c($sp)
-/* 9DB0C0 802440A0 AFB60028 */  sw        $s6, 0x28($sp)
-/* 9DB0C4 802440A4 AFB50024 */  sw        $s5, 0x24($sp)
-/* 9DB0C8 802440A8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 9DB0CC 802440AC AFB00010 */  sw        $s0, 0x10($sp)
-/* 9DB0D0 802440B0 8E82000C */  lw        $v0, 0xc($s4)
-/* 9DB0D4 802440B4 0260882D */  daddu     $s1, $s3, $zero
-/* 9DB0D8 802440B8 8C560000 */  lw        $s6, ($v0)
-/* 9DB0DC 802440BC 26500010 */  addiu     $s0, $s2, 0x10
-/* 9DB0E0 802440C0 0C0B1EAF */  jal       evt_get_variable
-/* 9DB0E4 802440C4 02C0282D */   daddu    $a1, $s6, $zero
-/* 9DB0E8 802440C8 0280202D */  daddu     $a0, $s4, $zero
-/* 9DB0EC 802440CC 2455FFFF */  addiu     $s5, $v0, -1
-/* 9DB0F0 802440D0 001510C0 */  sll       $v0, $s5, 3
-/* 9DB0F4 802440D4 00551023 */  subu      $v0, $v0, $s5
-/* 9DB0F8 802440D8 00021080 */  sll       $v0, $v0, 2
-/* 9DB0FC 802440DC 3C058025 */  lui       $a1, %hi(D_80252784_9E97A4 + 0x10)
-/* 9DB100 802440E0 00A22821 */  addu      $a1, $a1, $v0
-/* 9DB104 802440E4 8CA52794 */  lw        $a1, %lo(D_80252784_9E97A4 + 0x10)($a1)
-/* 9DB108 802440E8 0C0B2026 */  jal       evt_set_variable
-/* 9DB10C 802440EC 24060001 */   addiu    $a2, $zero, 1
-.L802440F0:
-/* 9DB110 802440F0 8E05FFFC */  lw        $a1, -4($s0)
-/* 9DB114 802440F4 0C0B1EAF */  jal       evt_get_variable
-/* 9DB118 802440F8 0280202D */   daddu    $a0, $s4, $zero
-/* 9DB11C 802440FC 5040000D */  beql      $v0, $zero, .L80244134
-/* 9DB120 80244100 26310001 */   addiu    $s1, $s1, 1
-/* 9DB124 80244104 8E050004 */  lw        $a1, 4($s0)
-/* 9DB128 80244108 0C0B1EAF */  jal       evt_get_variable
-/* 9DB12C 8024410C 0280202D */   daddu    $a0, $s4, $zero
-/* 9DB130 80244110 54400008 */  bnel      $v0, $zero, .L80244134
-/* 9DB134 80244114 26310001 */   addiu    $s1, $s1, 1
-/* 9DB138 80244118 26730001 */  addiu     $s3, $s3, 1
-/* 9DB13C 8024411C 8E050000 */  lw        $a1, ($s0)
-/* 9DB140 80244120 0C0B1EAF */  jal       evt_get_variable
-/* 9DB144 80244124 0280202D */   daddu    $a0, $s4, $zero
-/* 9DB148 80244128 10400007 */  beqz      $v0, .L80244148
-/* 9DB14C 8024412C 24020014 */   addiu    $v0, $zero, 0x14
-/* 9DB150 80244130 26310001 */  addiu     $s1, $s1, 1
-.L80244134:
-/* 9DB154 80244134 2610001C */  addiu     $s0, $s0, 0x1c
-/* 9DB158 80244138 2E220014 */  sltiu     $v0, $s1, 0x14
-/* 9DB15C 8024413C 1440FFEC */  bnez      $v0, .L802440F0
-/* 9DB160 80244140 2652001C */   addiu    $s2, $s2, 0x1c
-/* 9DB164 80244144 24020014 */  addiu     $v0, $zero, 0x14
-.L80244148:
-/* 9DB168 80244148 16220024 */  bne       $s1, $v0, .L802441DC
-/* 9DB16C 8024414C 0280202D */   daddu    $a0, $s4, $zero
-/* 9DB170 80244150 2A620002 */  slti      $v0, $s3, 2
-/* 9DB174 80244154 10400004 */  beqz      $v0, .L80244168
-/* 9DB178 80244158 02C0282D */   daddu    $a1, $s6, $zero
-/* 9DB17C 8024415C AE800084 */  sw        $zero, 0x84($s4)
-/* 9DB180 80244160 0809107B */  j         .L802441EC
-/* 9DB184 80244164 240600FF */   addiu    $a2, $zero, 0xff
-.L80244168:
-/* 9DB188 80244168 0C00A67F */  jal       rand_int
-/* 9DB18C 8024416C 2664FFFE */   addiu    $a0, $s3, -2
-/* 9DB190 80244170 0040B82D */  daddu     $s7, $v0, $zero
-/* 9DB194 80244174 0000982D */  daddu     $s3, $zero, $zero
-/* 9DB198 80244178 3C128025 */  lui       $s2, %hi(D_80252784_9E97A4)
-/* 9DB19C 8024417C 26522784 */  addiu     $s2, $s2, %lo(D_80252784_9E97A4)
-/* 9DB1A0 80244180 0260882D */  daddu     $s1, $s3, $zero
-/* 9DB1A4 80244184 26500014 */  addiu     $s0, $s2, 0x14
-.L80244188:
-/* 9DB1A8 80244188 5235000F */  beql      $s1, $s5, .L802441C8
-/* 9DB1AC 8024418C 26310001 */   addiu    $s1, $s1, 1
-/* 9DB1B0 80244190 8E05FFF8 */  lw        $a1, -8($s0)
-/* 9DB1B4 80244194 0C0B1EAF */  jal       evt_get_variable
-/* 9DB1B8 80244198 0280202D */   daddu    $a0, $s4, $zero
-/* 9DB1BC 8024419C 5040000A */  beql      $v0, $zero, .L802441C8
-/* 9DB1C0 802441A0 26310001 */   addiu    $s1, $s1, 1
-/* 9DB1C4 802441A4 8E050000 */  lw        $a1, ($s0)
-/* 9DB1C8 802441A8 0C0B1EAF */  jal       evt_get_variable
-/* 9DB1CC 802441AC 0280202D */   daddu    $a0, $s4, $zero
-/* 9DB1D0 802441B0 54400005 */  bnel      $v0, $zero, .L802441C8
-/* 9DB1D4 802441B4 26310001 */   addiu    $s1, $s1, 1
-/* 9DB1D8 802441B8 0260102D */  daddu     $v0, $s3, $zero
-/* 9DB1DC 802441BC 10570006 */  beq       $v0, $s7, .L802441D8
-/* 9DB1E0 802441C0 26730001 */   addiu    $s3, $s3, 1
-/* 9DB1E4 802441C4 26310001 */  addiu     $s1, $s1, 1
-.L802441C8:
-/* 9DB1E8 802441C8 2610001C */  addiu     $s0, $s0, 0x1c
-/* 9DB1EC 802441CC 2E220014 */  sltiu     $v0, $s1, 0x14
-/* 9DB1F0 802441D0 1440FFED */  bnez      $v0, .L80244188
-/* 9DB1F4 802441D4 2652001C */   addiu    $s2, $s2, 0x1c
-.L802441D8:
-/* 9DB1F8 802441D8 0280202D */  daddu     $a0, $s4, $zero
-.L802441DC:
-/* 9DB1FC 802441DC 02C0282D */  daddu     $a1, $s6, $zero
-/* 9DB200 802441E0 8E420000 */  lw        $v0, ($s2)
-/* 9DB204 802441E4 26260001 */  addiu     $a2, $s1, 1
-/* 9DB208 802441E8 AC820084 */  sw        $v0, 0x84($a0)
-.L802441EC:
-/* 9DB20C 802441EC 0C0B2026 */  jal       evt_set_variable
-/* 9DB210 802441F0 00000000 */   nop
-/* 9DB214 802441F4 24020002 */  addiu     $v0, $zero, 2
-/* 9DB218 802441F8 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 9DB21C 802441FC 8FB7002C */  lw        $s7, 0x2c($sp)
-/* 9DB220 80244200 8FB60028 */  lw        $s6, 0x28($sp)
-/* 9DB224 80244204 8FB50024 */  lw        $s5, 0x24($sp)
-/* 9DB228 80244208 8FB40020 */  lw        $s4, 0x20($sp)
-/* 9DB22C 8024420C 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 9DB230 80244210 8FB20018 */  lw        $s2, 0x18($sp)
-/* 9DB234 80244214 8FB10014 */  lw        $s1, 0x14($sp)
-/* 9DB238 80244218 8FB00010 */  lw        $s0, 0x10($sp)
-/* 9DB23C 8024421C 03E00008 */  jr        $ra
-/* 9DB240 80244220 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s
deleted file mode 100644
index 9236de7f34..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802402C0_D9D790
-/* D9D790 802402C0 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* D9D794 802402C4 AFB5002C */  sw        $s5, 0x2c($sp)
-/* D9D798 802402C8 00A0A82D */  daddu     $s5, $a1, $zero
-/* D9D79C 802402CC AFB40028 */  sw        $s4, 0x28($sp)
-/* D9D7A0 802402D0 0080A02D */  daddu     $s4, $a0, $zero
-/* D9D7A4 802402D4 AFBF0034 */  sw        $ra, 0x34($sp)
-/* D9D7A8 802402D8 AFB60030 */  sw        $s6, 0x30($sp)
-/* D9D7AC 802402DC AFB30024 */  sw        $s3, 0x24($sp)
-/* D9D7B0 802402E0 AFB20020 */  sw        $s2, 0x20($sp)
-/* D9D7B4 802402E4 AFB1001C */  sw        $s1, 0x1c($sp)
-/* D9D7B8 802402E8 AFB00018 */  sw        $s0, 0x18($sp)
-/* D9D7BC 802402EC F7B80048 */  sdc1      $f24, 0x48($sp)
-/* D9D7C0 802402F0 F7B60040 */  sdc1      $f22, 0x40($sp)
-/* D9D7C4 802402F4 F7B40038 */  sdc1      $f20, 0x38($sp)
-.L802402F8:
-/* D9D7C8 802402F8 240200DE */  addiu     $v0, $zero, 0xde
-/* D9D7CC 802402FC 8E920000 */  lw        $s2, ($s4)
-/* D9D7D0 80240300 8E930004 */  lw        $s3, 4($s4)
-/* D9D7D4 80240304 0012B602 */  srl       $s6, $s2, 0x18
-/* D9D7D8 80240308 32D000FF */  andi      $s0, $s6, 0xff
-/* D9D7DC 8024030C 16020005 */  bne       $s0, $v0, .L80240324
-/* D9D7E0 80240310 24020001 */   addiu    $v0, $zero, 1
-/* D9D7E4 80240314 0260202D */  daddu     $a0, $s3, $zero
-/* D9D7E8 80240318 0C0900B0 */  jal       func_802402C0_D9D790
-/* D9D7EC 8024031C 02A0282D */   daddu    $a1, $s5, $zero
-/* D9D7F0 80240320 24020001 */  addiu     $v0, $zero, 1
-.L80240324:
-/* D9D7F4 80240324 16020036 */  bne       $s0, $v0, .L80240400
-/* D9D7F8 80240328 240200DF */   addiu    $v0, $zero, 0xdf
-/* D9D7FC 8024032C 0000882D */  daddu     $s1, $zero, $zero
-/* D9D800 80240330 2402FFFF */  addiu     $v0, $zero, -1
-/* D9D804 80240334 AEA20000 */  sw        $v0, ($s5)
-/* D9D808 80240338 00121302 */  srl       $v0, $s2, 0xc
-/* D9D80C 8024033C 4480A000 */  mtc1      $zero, $f20
-/* D9D810 80240340 305200FF */  andi      $s2, $v0, 0xff
-/* D9D814 80240344 4600A606 */  mov.s     $f24, $f20
-/* D9D818 80240348 1240002C */  beqz      $s2, .L802403FC
-/* D9D81C 8024034C 4600A586 */   mov.s    $f22, $f20
-/* D9D820 80240350 0260802D */  daddu     $s0, $s3, $zero
-.L80240354:
-/* D9D824 80240354 86020000 */  lh        $v0, ($s0)
-/* D9D828 80240358 44822000 */  mtc1      $v0, $f4
-/* D9D82C 8024035C 00000000 */  nop
-/* D9D830 80240360 46802120 */  cvt.s.w   $f4, $f4
-/* D9D834 80240364 46162101 */  sub.s     $f4, $f4, $f22
-/* D9D838 80240368 46042102 */  mul.s     $f4, $f4, $f4
-/* D9D83C 8024036C 00000000 */  nop
-/* D9D840 80240370 86020002 */  lh        $v0, 2($s0)
-/* D9D844 80240374 44821000 */  mtc1      $v0, $f2
-/* D9D848 80240378 00000000 */  nop
-/* D9D84C 8024037C 468010A0 */  cvt.s.w   $f2, $f2
-/* D9D850 80240380 46181081 */  sub.s     $f2, $f2, $f24
-/* D9D854 80240384 46021082 */  mul.s     $f2, $f2, $f2
-/* D9D858 80240388 00000000 */  nop
-/* D9D85C 8024038C 86020004 */  lh        $v0, 4($s0)
-/* D9D860 80240390 44820000 */  mtc1      $v0, $f0
-/* D9D864 80240394 00000000 */  nop
-/* D9D868 80240398 46800020 */  cvt.s.w   $f0, $f0
-/* D9D86C 8024039C 46140001 */  sub.s     $f0, $f0, $f20
-/* D9D870 802403A0 46000002 */  mul.s     $f0, $f0, $f0
-/* D9D874 802403A4 00000000 */  nop
-/* D9D878 802403A8 46022100 */  add.s     $f4, $f4, $f2
-/* D9D87C 802403AC 46002300 */  add.s     $f12, $f4, $f0
-/* D9D880 802403B0 46006084 */  sqrt.s    $f2, $f12
-/* D9D884 802403B4 46021032 */  c.eq.s    $f2, $f2
-/* D9D888 802403B8 00000000 */  nop
-/* D9D88C 802403BC 45010004 */  bc1t      .L802403D0
-/* D9D890 802403C0 00000000 */   nop
-/* D9D894 802403C4 0C0187BC */  jal       sqrtf
-/* D9D898 802403C8 00000000 */   nop
-/* D9D89C 802403CC 46000086 */  mov.s     $f2, $f0
-.L802403D0:
-/* D9D8A0 802403D0 C6A00000 */  lwc1      $f0, ($s5)
-/* D9D8A4 802403D4 46800020 */  cvt.s.w   $f0, $f0
-/* D9D8A8 802403D8 4602003C */  c.lt.s    $f0, $f2
-/* D9D8AC 802403DC 00000000 */  nop
-/* D9D8B0 802403E0 45000003 */  bc1f      .L802403F0
-/* D9D8B4 802403E4 26310001 */   addiu    $s1, $s1, 1
-/* D9D8B8 802403E8 4600118D */  trunc.w.s $f6, $f2
-/* D9D8BC 802403EC E6A60000 */  swc1      $f6, ($s5)
-.L802403F0:
-/* D9D8C0 802403F0 0232102A */  slt       $v0, $s1, $s2
-/* D9D8C4 802403F4 1440FFD7 */  bnez      $v0, .L80240354
-/* D9D8C8 802403F8 26100010 */   addiu    $s0, $s0, 0x10
-.L802403FC:
-/* D9D8CC 802403FC 240200DF */  addiu     $v0, $zero, 0xdf
-.L80240400:
-/* D9D8D0 80240400 16C2FFBD */  bne       $s6, $v0, .L802402F8
-/* D9D8D4 80240404 26940008 */   addiu    $s4, $s4, 8
-/* D9D8D8 80240408 8FBF0034 */  lw        $ra, 0x34($sp)
-/* D9D8DC 8024040C 8FB60030 */  lw        $s6, 0x30($sp)
-/* D9D8E0 80240410 8FB5002C */  lw        $s5, 0x2c($sp)
-/* D9D8E4 80240414 8FB40028 */  lw        $s4, 0x28($sp)
-/* D9D8E8 80240418 8FB30024 */  lw        $s3, 0x24($sp)
-/* D9D8EC 8024041C 8FB20020 */  lw        $s2, 0x20($sp)
-/* D9D8F0 80240420 8FB1001C */  lw        $s1, 0x1c($sp)
-/* D9D8F4 80240424 8FB00018 */  lw        $s0, 0x18($sp)
-/* D9D8F8 80240428 D7B80048 */  ldc1      $f24, 0x48($sp)
-/* D9D8FC 8024042C D7B60040 */  ldc1      $f22, 0x40($sp)
-/* D9D900 80240430 D7B40038 */  ldc1      $f20, 0x38($sp)
-/* D9D904 80240434 03E00008 */  jr        $ra
-/* D9D908 80240438 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s
deleted file mode 100644
index e2598bb91c..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s
+++ /dev/null
@@ -1,349 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024043C_D9D90C
-/* D9D90C 8024043C 27BDFEB0 */  addiu     $sp, $sp, -0x150
-/* D9D910 80240440 AFB70134 */  sw        $s7, 0x134($sp)
-/* D9D914 80240444 AFBF013C */  sw        $ra, 0x13c($sp)
-/* D9D918 80240448 AFBE0138 */  sw        $fp, 0x138($sp)
-/* D9D91C 8024044C AFB60130 */  sw        $s6, 0x130($sp)
-/* D9D920 80240450 AFB5012C */  sw        $s5, 0x12c($sp)
-/* D9D924 80240454 AFB40128 */  sw        $s4, 0x128($sp)
-/* D9D928 80240458 AFB30124 */  sw        $s3, 0x124($sp)
-/* D9D92C 8024045C AFB20120 */  sw        $s2, 0x120($sp)
-/* D9D930 80240460 AFB1011C */  sw        $s1, 0x11c($sp)
-/* D9D934 80240464 AFB00118 */  sw        $s0, 0x118($sp)
-/* D9D938 80240468 F7B60148 */  sdc1      $f22, 0x148($sp)
-/* D9D93C 8024046C F7B40140 */  sdc1      $f20, 0x140($sp)
-/* D9D940 80240470 10A0007E */  beqz      $a1, .L8024066C
-/* D9D944 80240474 0080B82D */   daddu    $s7, $a0, $zero
-/* D9D948 80240478 0C00AB39 */  jal       heap_malloc
-/* D9D94C 8024047C 24040690 */   addiu    $a0, $zero, 0x690
-/* D9D950 80240480 0000982D */  daddu     $s3, $zero, $zero
-/* D9D954 80240484 AEE20070 */  sw        $v0, 0x70($s7)
-/* D9D958 80240488 0040882D */  daddu     $s1, $v0, $zero
-/* D9D95C 8024048C 3C148024 */  lui       $s4, %hi(D_80243580_DA0A50)
-/* D9D960 80240490 26943580 */  addiu     $s4, $s4, %lo(D_80243580_DA0A50)
-/* D9D964 80240494 3C014120 */  lui       $at, 0x4120
-/* D9D968 80240498 4481A000 */  mtc1      $at, $f20
-/* D9D96C 8024049C 26300088 */  addiu     $s0, $s1, 0x88
-/* D9D970 802404A0 AEE00074 */  sw        $zero, 0x74($s7)
-.L802404A4:
-/* D9D974 802404A4 8E820000 */  lw        $v0, ($s4)
-/* D9D978 802404A8 AE02FFB8 */  sw        $v0, -0x48($s0)
-/* D9D97C 802404AC 0040202D */  daddu     $a0, $v0, $zero
-/* D9D980 802404B0 00131080 */  sll       $v0, $s3, 2
-/* D9D984 802404B4 3C018024 */  lui       $at, %hi(D_802435B0_DA0A80)
-/* D9D988 802404B8 00220821 */  addu      $at, $at, $v0
-/* D9D98C 802404BC 8C2235B0 */  lw        $v0, %lo(D_802435B0_DA0A80)($at)
-/* D9D990 802404C0 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* D9D994 802404C4 AE02FFBC */   sw       $v0, -0x44($s0)
-/* D9D998 802404C8 0C046B4C */  jal       get_model_from_list_index
-/* D9D99C 802404CC 0040202D */   daddu    $a0, $v0, $zero
-/* D9D9A0 802404D0 0040902D */  daddu     $s2, $v0, $zero
-/* D9D9A4 802404D4 AE200000 */  sw        $zero, ($s1)
-/* D9D9A8 802404D8 C6400098 */  lwc1      $f0, 0x98($s2)
-/* D9D9AC 802404DC E600FF7C */  swc1      $f0, -0x84($s0)
-/* D9D9B0 802404E0 C640009C */  lwc1      $f0, 0x9c($s2)
-/* D9D9B4 802404E4 E600FF80 */  swc1      $f0, -0x80($s0)
-/* D9D9B8 802404E8 C64000A0 */  lwc1      $f0, 0xa0($s2)
-/* D9D9BC 802404EC C602FF80 */  lwc1      $f2, -0x80($s0)
-/* D9D9C0 802404F0 E600FF84 */  swc1      $f0, -0x7c($s0)
-/* D9D9C4 802404F4 C600FF7C */  lwc1      $f0, -0x84($s0)
-/* D9D9C8 802404F8 C604FF84 */  lwc1      $f4, -0x7c($s0)
-/* D9D9CC 802404FC 24040014 */  addiu     $a0, $zero, 0x14
-/* D9D9D0 80240500 AE00FF94 */  sw        $zero, -0x6c($s0)
-/* D9D9D4 80240504 AE00FF98 */  sw        $zero, -0x68($s0)
-/* D9D9D8 80240508 AE00FF9C */  sw        $zero, -0x64($s0)
-/* D9D9DC 8024050C E602FF8C */  swc1      $f2, -0x74($s0)
-/* D9D9E0 80240510 E600FF88 */  swc1      $f0, -0x78($s0)
-/* D9D9E4 80240514 0C00A67F */  jal       rand_int
-/* D9D9E8 80240518 E604FF90 */   swc1     $f4, -0x70($s0)
-/* D9D9EC 8024051C 24040014 */  addiu     $a0, $zero, 0x14
-/* D9D9F0 80240520 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* D9D9F4 80240524 44820000 */  mtc1      $v0, $f0
-/* D9D9F8 80240528 00000000 */  nop
-/* D9D9FC 8024052C 46800020 */  cvt.s.w   $f0, $f0
-/* D9DA00 80240530 0C00A67F */  jal       rand_int
-/* D9DA04 80240534 E600FFA0 */   swc1     $f0, -0x60($s0)
-/* D9DA08 80240538 24040014 */  addiu     $a0, $zero, 0x14
-/* D9DA0C 8024053C 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* D9DA10 80240540 44820000 */  mtc1      $v0, $f0
-/* D9DA14 80240544 00000000 */  nop
-/* D9DA18 80240548 46800020 */  cvt.s.w   $f0, $f0
-/* D9DA1C 8024054C 0C00A67F */  jal       rand_int
-/* D9DA20 80240550 E600FFA4 */   swc1     $f0, -0x5c($s0)
-/* D9DA24 80240554 24040028 */  addiu     $a0, $zero, 0x28
-/* D9DA28 80240558 2442FFF6 */  addiu     $v0, $v0, -0xa
-/* D9DA2C 8024055C 44820000 */  mtc1      $v0, $f0
-/* D9DA30 80240560 00000000 */  nop
-/* D9DA34 80240564 46800020 */  cvt.s.w   $f0, $f0
-/* D9DA38 80240568 0C00A67F */  jal       rand_int
-/* D9DA3C 8024056C E600FFA8 */   swc1     $f0, -0x58($s0)
-/* D9DA40 80240570 3C0142C8 */  lui       $at, 0x42c8
-/* D9DA44 80240574 44811000 */  mtc1      $at, $f2
-/* D9DA48 80240578 44820000 */  mtc1      $v0, $f0
-/* D9DA4C 8024057C 00000000 */  nop
-/* D9DA50 80240580 46800020 */  cvt.s.w   $f0, $f0
-/* D9DA54 80240584 46020000 */  add.s     $f0, $f0, $f2
-/* D9DA58 80240588 2404001E */  addiu     $a0, $zero, 0x1e
-/* D9DA5C 8024058C 46140003 */  div.s     $f0, $f0, $f20
-/* D9DA60 80240590 0C00A67F */  jal       rand_int
-/* D9DA64 80240594 E600FFAC */   swc1     $f0, -0x54($s0)
-/* D9DA68 80240598 3C014270 */  lui       $at, 0x4270
-/* D9DA6C 8024059C 44811000 */  mtc1      $at, $f2
-/* D9DA70 802405A0 44820000 */  mtc1      $v0, $f0
-/* D9DA74 802405A4 00000000 */  nop
-/* D9DA78 802405A8 46800020 */  cvt.s.w   $f0, $f0
-/* D9DA7C 802405AC 46020000 */  add.s     $f0, $f0, $f2
-/* D9DA80 802405B0 24040064 */  addiu     $a0, $zero, 0x64
-/* D9DA84 802405B4 46140003 */  div.s     $f0, $f0, $f20
-/* D9DA88 802405B8 0C00A67F */  jal       rand_int
-/* D9DA8C 802405BC E600FFB0 */   swc1     $f0, -0x50($s0)
-/* D9DA90 802405C0 00021FC2 */  srl       $v1, $v0, 0x1f
-/* D9DA94 802405C4 00431821 */  addu      $v1, $v0, $v1
-/* D9DA98 802405C8 00031843 */  sra       $v1, $v1, 1
-/* D9DA9C 802405CC 00031840 */  sll       $v1, $v1, 1
-/* D9DAA0 802405D0 00431023 */  subu      $v0, $v0, $v1
-/* D9DAA4 802405D4 3C014334 */  lui       $at, 0x4334
-/* D9DAA8 802405D8 44811000 */  mtc1      $at, $f2
-/* D9DAAC 802405DC 44820000 */  mtc1      $v0, $f0
-/* D9DAB0 802405E0 00000000 */  nop
-/* D9DAB4 802405E4 46800020 */  cvt.s.w   $f0, $f0
-/* D9DAB8 802405E8 46020002 */  mul.s     $f0, $f0, $f2
-/* D9DABC 802405EC 00000000 */  nop
-/* D9DAC0 802405F0 3C0142B4 */  lui       $at, 0x42b4
-/* D9DAC4 802405F4 44811000 */  mtc1      $at, $f2
-/* D9DAC8 802405F8 00000000 */  nop
-/* D9DACC 802405FC 46020000 */  add.s     $f0, $f0, $f2
-/* D9DAD0 80240600 E600FFB4 */  swc1      $f0, -0x4c($s0)
-/* D9DAD4 80240604 8E420008 */  lw        $v0, 8($s2)
-/* D9DAD8 80240608 8C420004 */  lw        $v0, 4($v0)
-/* D9DADC 8024060C 8C440000 */  lw        $a0, ($v0)
-/* D9DAE0 80240610 0C0900B0 */  jal       func_802402C0_D9D790
-/* D9DAE4 80240614 0200282D */   daddu    $a1, $s0, $zero
-/* D9DAE8 80240618 0000302D */  daddu     $a2, $zero, $zero
-/* D9DAEC 8024061C 0000282D */  daddu     $a1, $zero, $zero
-.L80240620:
-/* D9DAF0 80240620 00062100 */  sll       $a0, $a2, 4
-.L80240624:
-/* D9DAF4 80240624 02241821 */  addu      $v1, $s1, $a0
-/* D9DAF8 80240628 02441021 */  addu      $v0, $s2, $a0
-/* D9DAFC 8024062C 24840004 */  addiu     $a0, $a0, 4
-/* D9DB00 80240630 24A50001 */  addiu     $a1, $a1, 1
-/* D9DB04 80240634 C4400058 */  lwc1      $f0, 0x58($v0)
-/* D9DB08 80240638 28A20004 */  slti      $v0, $a1, 4
-/* D9DB0C 8024063C 1440FFF9 */  bnez      $v0, .L80240624
-/* D9DB10 80240640 E4600048 */   swc1     $f0, 0x48($v1)
-/* D9DB14 80240644 24C60001 */  addiu     $a2, $a2, 1
-/* D9DB18 80240648 28C20004 */  slti      $v0, $a2, 4
-/* D9DB1C 8024064C 1440FFF4 */  bnez      $v0, .L80240620
-/* D9DB20 80240650 0000282D */   daddu    $a1, $zero, $zero
-/* D9DB24 80240654 26940004 */  addiu     $s4, $s4, 4
-/* D9DB28 80240658 26730001 */  addiu     $s3, $s3, 1
-/* D9DB2C 8024065C 2610008C */  addiu     $s0, $s0, 0x8c
-/* D9DB30 80240660 2E62000C */  sltiu     $v0, $s3, 0xc
-/* D9DB34 80240664 1440FF8F */  bnez      $v0, .L802404A4
-/* D9DB38 80240668 2631008C */   addiu    $s1, $s1, 0x8c
-.L8024066C:
-/* D9DB3C 8024066C 0000982D */  daddu     $s3, $zero, $zero
-/* D9DB40 80240670 241E0064 */  addiu     $fp, $zero, 0x64
-/* D9DB44 80240674 27B50058 */  addiu     $s5, $sp, 0x58
-/* D9DB48 80240678 27B40098 */  addiu     $s4, $sp, 0x98
-/* D9DB4C 8024067C 27B600D8 */  addiu     $s6, $sp, 0xd8
-/* D9DB50 80240680 8EF10070 */  lw        $s1, 0x70($s7)
-/* D9DB54 80240684 4480A000 */  mtc1      $zero, $f20
-/* D9DB58 80240688 3C013F80 */  lui       $at, 0x3f80
-/* D9DB5C 8024068C 4481B000 */  mtc1      $at, $f22
-/* D9DB60 80240690 26300024 */  addiu     $s0, $s1, 0x24
-.L80240694:
-/* D9DB64 80240694 0C046C04 */  jal       get_model_list_index_from_tree_index
-/* D9DB68 80240698 8E04001C */   lw       $a0, 0x1c($s0)
-/* D9DB6C 8024069C 0C046B4C */  jal       get_model_from_list_index
-/* D9DB70 802406A0 0040202D */   daddu    $a0, $v0, $zero
-/* D9DB74 802406A4 8E230000 */  lw        $v1, ($s1)
-/* D9DB78 802406A8 107E0036 */  beq       $v1, $fp, .L80240784
-/* D9DB7C 802406AC 0040902D */   daddu    $s2, $v0, $zero
-/* D9DB80 802406B0 28620065 */  slti      $v0, $v1, 0x65
-/* D9DB84 802406B4 1040003C */  beqz      $v0, .L802407A8
-/* D9DB88 802406B8 0000302D */   daddu    $a2, $zero, $zero
-/* D9DB8C 802406BC 1460003B */  bnez      $v1, .L802407AC
-/* D9DB90 802406C0 0000282D */   daddu    $a1, $zero, $zero
-/* D9DB94 802406C4 26240004 */  addiu     $a0, $s1, 4
-/* D9DB98 802406C8 8E060014 */  lw        $a2, 0x14($s0)
-/* D9DB9C 802406CC 8E070018 */  lw        $a3, 0x18($s0)
-/* D9DBA0 802406D0 0C00A7E7 */  jal       add_vec2D_polar
-/* D9DBA4 802406D4 2625000C */   addiu    $a1, $s1, 0xc
-/* D9DBA8 802406D8 C6020010 */  lwc1      $f2, 0x10($s0)
-/* D9DBAC 802406DC 3C013F4C */  lui       $at, 0x3f4c
-/* D9DBB0 802406E0 3421CCCD */  ori       $at, $at, 0xcccd
-/* D9DBB4 802406E4 44810000 */  mtc1      $at, $f0
-/* D9DBB8 802406E8 00000000 */  nop
-/* D9DBBC 802406EC 46001081 */  sub.s     $f2, $f2, $f0
-/* D9DBC0 802406F0 C600FFE4 */  lwc1      $f0, -0x1c($s0)
-/* D9DBC4 802406F4 E6020010 */  swc1      $f2, 0x10($s0)
-/* D9DBC8 802406F8 46020080 */  add.s     $f2, $f0, $f2
-/* D9DBCC 802406FC C6000010 */  lwc1      $f0, 0x10($s0)
-/* D9DBD0 80240700 4614003E */  c.le.s    $f0, $f20
-/* D9DBD4 80240704 00000000 */  nop
-/* D9DBD8 80240708 45000026 */  bc1f      .L802407A4
-/* D9DBDC 8024070C E602FFE4 */   swc1     $f2, -0x1c($s0)
-/* D9DBE0 80240710 C6040064 */  lwc1      $f4, 0x64($s0)
-/* D9DBE4 80240714 46802120 */  cvt.s.w   $f4, $f4
-/* D9DBE8 80240718 4604103C */  c.lt.s    $f2, $f4
-/* D9DBEC 8024071C 00000000 */  nop
-/* D9DBF0 80240720 45000020 */  bc1f      .L802407A4
-/* D9DBF4 80240724 46000086 */   mov.s    $f2, $f0
-/* D9DBF8 80240728 3C01BF33 */  lui       $at, 0xbf33
-/* D9DBFC 8024072C 34213333 */  ori       $at, $at, 0x3333
-/* D9DC00 80240730 44810000 */  mtc1      $at, $f0
-/* D9DC04 80240734 00000000 */  nop
-/* D9DC08 80240738 46001082 */  mul.s     $f2, $f2, $f0
-/* D9DC0C 8024073C 00000000 */  nop
-/* D9DC10 80240740 E604FFE4 */  swc1      $f4, -0x1c($s0)
-/* D9DC14 80240744 4616103C */  c.lt.s    $f2, $f22
-/* D9DC18 80240748 00000000 */  nop
-/* D9DC1C 8024074C 45000005 */  bc1f      .L80240764
-/* D9DC20 80240750 E6020010 */   swc1     $f2, 0x10($s0)
-/* D9DC24 80240754 AE3E0000 */  sw        $fp, ($s1)
-/* D9DC28 80240758 E6140004 */  swc1      $f20, 4($s0)
-/* D9DC2C 8024075C E6140008 */  swc1      $f20, 8($s0)
-/* D9DC30 80240760 E614000C */  swc1      $f20, 0xc($s0)
-.L80240764:
-/* D9DC34 80240764 32620001 */  andi      $v0, $s3, 1
-/* D9DC38 80240768 1040000E */  beqz      $v0, .L802407A4
-/* D9DC3C 8024076C 0000202D */   daddu    $a0, $zero, $zero
-/* D9DC40 80240770 0080282D */  daddu     $a1, $a0, $zero
-/* D9DC44 80240774 0C0B2D5B */  jal       exec_ShakeCam1
-/* D9DC48 80240778 24060001 */   addiu    $a2, $zero, 1
-/* D9DC4C 8024077C 080901EA */  j         .L802407A8
-/* D9DC50 80240780 0000302D */   daddu    $a2, $zero, $zero
-.L80240784:
-/* D9DC54 80240784 86040022 */  lh        $a0, 0x22($s0)
-/* D9DC58 80240788 0C016E89 */  jal       update_collider_transform
-/* D9DC5C 8024078C 00000000 */   nop
-/* D9DC60 80240790 8EE20074 */  lw        $v0, 0x74($s7)
-/* D9DC64 80240794 24420001 */  addiu     $v0, $v0, 1
-/* D9DC68 80240798 AEE20074 */  sw        $v0, 0x74($s7)
-/* D9DC6C 8024079C 24020065 */  addiu     $v0, $zero, 0x65
-/* D9DC70 802407A0 AE220000 */  sw        $v0, ($s1)
-.L802407A4:
-/* D9DC74 802407A4 0000302D */  daddu     $a2, $zero, $zero
-.L802407A8:
-/* D9DC78 802407A8 0000282D */  daddu     $a1, $zero, $zero
-.L802407AC:
-/* D9DC7C 802407AC 00062100 */  sll       $a0, $a2, 4
-.L802407B0:
-/* D9DC80 802407B0 02441821 */  addu      $v1, $s2, $a0
-/* D9DC84 802407B4 02241021 */  addu      $v0, $s1, $a0
-/* D9DC88 802407B8 24840004 */  addiu     $a0, $a0, 4
-/* D9DC8C 802407BC 24A50001 */  addiu     $a1, $a1, 1
-/* D9DC90 802407C0 C4400048 */  lwc1      $f0, 0x48($v0)
-/* D9DC94 802407C4 28A20004 */  slti      $v0, $a1, 4
-/* D9DC98 802407C8 1440FFF9 */  bnez      $v0, .L802407B0
-/* D9DC9C 802407CC E4600058 */   swc1     $f0, 0x58($v1)
-/* D9DCA0 802407D0 24C60001 */  addiu     $a2, $a2, 1
-/* D9DCA4 802407D4 28C20004 */  slti      $v0, $a2, 4
-/* D9DCA8 802407D8 1440FFF4 */  bnez      $v0, .L802407AC
-/* D9DCAC 802407DC 0000282D */   daddu    $a1, $zero, $zero
-/* D9DCB0 802407E0 96420000 */  lhu       $v0, ($s2)
-/* D9DCB4 802407E4 34421400 */  ori       $v0, $v0, 0x1400
-/* D9DCB8 802407E8 A6420000 */  sh        $v0, ($s2)
-/* D9DCBC 802407EC C602FFE0 */  lwc1      $f2, -0x20($s0)
-/* D9DCC0 802407F0 C600FFEC */  lwc1      $f0, -0x14($s0)
-/* D9DCC4 802407F4 46001081 */  sub.s     $f2, $f2, $f0
-/* D9DCC8 802407F8 C600FFF0 */  lwc1      $f0, -0x10($s0)
-/* D9DCCC 802407FC 44051000 */  mfc1      $a1, $f2
-/* D9DCD0 80240800 C602FFE4 */  lwc1      $f2, -0x1c($s0)
-/* D9DCD4 80240804 46001081 */  sub.s     $f2, $f2, $f0
-/* D9DCD8 80240808 C600FFF4 */  lwc1      $f0, -0xc($s0)
-/* D9DCDC 8024080C 44061000 */  mfc1      $a2, $f2
-/* D9DCE0 80240810 C602FFE8 */  lwc1      $f2, -0x18($s0)
-/* D9DCE4 80240814 46001081 */  sub.s     $f2, $f2, $f0
-/* D9DCE8 80240818 44071000 */  mfc1      $a3, $f2
-/* D9DCEC 8024081C 0C019E40 */  jal       guTranslateF
-/* D9DCF0 80240820 27A40018 */   addiu    $a0, $sp, 0x18
-/* D9DCF4 80240824 C602FFF8 */  lwc1      $f2, -8($s0)
-/* D9DCF8 80240828 C6000004 */  lwc1      $f0, 4($s0)
-/* D9DCFC 8024082C C604FFFC */  lwc1      $f4, -4($s0)
-/* D9DD00 80240830 46001080 */  add.s     $f2, $f2, $f0
-/* D9DD04 80240834 C6000008 */  lwc1      $f0, 8($s0)
-/* D9DD08 80240838 46002100 */  add.s     $f4, $f4, $f0
-/* D9DD0C 8024083C C6000000 */  lwc1      $f0, ($s0)
-/* D9DD10 80240840 E602FFF8 */  swc1      $f2, -8($s0)
-/* D9DD14 80240844 C602000C */  lwc1      $f2, 0xc($s0)
-/* D9DD18 80240848 C60CFFF8 */  lwc1      $f12, -8($s0)
-/* D9DD1C 8024084C 46020000 */  add.s     $f0, $f0, $f2
-/* D9DD20 80240850 E604FFFC */  swc1      $f4, -4($s0)
-/* D9DD24 80240854 0C00A6C9 */  jal       clamp_angle
-/* D9DD28 80240858 E6000000 */   swc1     $f0, ($s0)
-/* D9DD2C 8024085C C60CFFFC */  lwc1      $f12, -4($s0)
-/* D9DD30 80240860 26730001 */  addiu     $s3, $s3, 1
-/* D9DD34 80240864 0C00A6C9 */  jal       clamp_angle
-/* D9DD38 80240868 E600FFF8 */   swc1     $f0, -8($s0)
-/* D9DD3C 8024086C C60C0000 */  lwc1      $f12, ($s0)
-/* D9DD40 80240870 2631008C */  addiu     $s1, $s1, 0x8c
-/* D9DD44 80240874 0C00A6C9 */  jal       clamp_angle
-/* D9DD48 80240878 E600FFFC */   swc1     $f0, -4($s0)
-/* D9DD4C 8024087C E6000000 */  swc1      $f0, ($s0)
-/* D9DD50 80240880 E7B40010 */  swc1      $f20, 0x10($sp)
-/* D9DD54 80240884 8E05FFF8 */  lw        $a1, -8($s0)
-/* D9DD58 80240888 4406B000 */  mfc1      $a2, $f22
-/* D9DD5C 8024088C 4407A000 */  mfc1      $a3, $f20
-/* D9DD60 80240890 0C019EC8 */  jal       guRotateF
-/* D9DD64 80240894 02A0202D */   daddu    $a0, $s5, $zero
-/* D9DD68 80240898 E7B40010 */  swc1      $f20, 0x10($sp)
-/* D9DD6C 8024089C 8E05FFFC */  lw        $a1, -4($s0)
-/* D9DD70 802408A0 4406A000 */  mfc1      $a2, $f20
-/* D9DD74 802408A4 4407B000 */  mfc1      $a3, $f22
-/* D9DD78 802408A8 0C019EC8 */  jal       guRotateF
-/* D9DD7C 802408AC 0280202D */   daddu    $a0, $s4, $zero
-/* D9DD80 802408B0 02C0202D */  daddu     $a0, $s6, $zero
-/* D9DD84 802408B4 E7B60010 */  swc1      $f22, 0x10($sp)
-/* D9DD88 802408B8 8E050000 */  lw        $a1, ($s0)
-/* D9DD8C 802408BC 4406A000 */  mfc1      $a2, $f20
-/* D9DD90 802408C0 4407A000 */  mfc1      $a3, $f20
-/* D9DD94 802408C4 0C019EC8 */  jal       guRotateF
-/* D9DD98 802408C8 2610008C */   addiu    $s0, $s0, 0x8c
-/* D9DD9C 802408CC 02C0202D */  daddu     $a0, $s6, $zero
-/* D9DDA0 802408D0 02A0282D */  daddu     $a1, $s5, $zero
-/* D9DDA4 802408D4 0C019D80 */  jal       guMtxCatF
-/* D9DDA8 802408D8 02A0302D */   daddu    $a2, $s5, $zero
-/* D9DDAC 802408DC 02A0202D */  daddu     $a0, $s5, $zero
-/* D9DDB0 802408E0 0280282D */  daddu     $a1, $s4, $zero
-/* D9DDB4 802408E4 0C019D80 */  jal       guMtxCatF
-/* D9DDB8 802408E8 0280302D */   daddu    $a2, $s4, $zero
-/* D9DDBC 802408EC 0280202D */  daddu     $a0, $s4, $zero
-/* D9DDC0 802408F0 27A50018 */  addiu     $a1, $sp, 0x18
-/* D9DDC4 802408F4 0C019D80 */  jal       guMtxCatF
-/* D9DDC8 802408F8 00A0302D */   daddu    $a2, $a1, $zero
-/* D9DDCC 802408FC 26440058 */  addiu     $a0, $s2, 0x58
-/* D9DDD0 80240900 27A50018 */  addiu     $a1, $sp, 0x18
-/* D9DDD4 80240904 0C019D80 */  jal       guMtxCatF
-/* D9DDD8 80240908 0080302D */   daddu    $a2, $a0, $zero
-/* D9DDDC 8024090C 2E62000C */  sltiu     $v0, $s3, 0xc
-/* D9DDE0 80240910 1440FF60 */  bnez      $v0, .L80240694
-/* D9DDE4 80240914 00000000 */   nop
-/* D9DDE8 80240918 8EE20074 */  lw        $v0, 0x74($s7)
-/* D9DDEC 8024091C 2C42000C */  sltiu     $v0, $v0, 0xc
-/* D9DDF0 80240920 14400005 */  bnez      $v0, .L80240938
-/* D9DDF4 80240924 0000102D */   daddu    $v0, $zero, $zero
-/* D9DDF8 80240928 8EE40070 */  lw        $a0, 0x70($s7)
-/* D9DDFC 8024092C 0C00AB4B */  jal       heap_free
-/* D9DE00 80240930 00000000 */   nop
-/* D9DE04 80240934 24020002 */  addiu     $v0, $zero, 2
-.L80240938:
-/* D9DE08 80240938 8FBF013C */  lw        $ra, 0x13c($sp)
-/* D9DE0C 8024093C 8FBE0138 */  lw        $fp, 0x138($sp)
-/* D9DE10 80240940 8FB70134 */  lw        $s7, 0x134($sp)
-/* D9DE14 80240944 8FB60130 */  lw        $s6, 0x130($sp)
-/* D9DE18 80240948 8FB5012C */  lw        $s5, 0x12c($sp)
-/* D9DE1C 8024094C 8FB40128 */  lw        $s4, 0x128($sp)
-/* D9DE20 80240950 8FB30124 */  lw        $s3, 0x124($sp)
-/* D9DE24 80240954 8FB20120 */  lw        $s2, 0x120($sp)
-/* D9DE28 80240958 8FB1011C */  lw        $s1, 0x11c($sp)
-/* D9DE2C 8024095C 8FB00118 */  lw        $s0, 0x118($sp)
-/* D9DE30 80240960 D7B60148 */  ldc1      $f22, 0x148($sp)
-/* D9DE34 80240964 D7B40140 */  ldc1      $f20, 0x140($sp)
-/* D9DE38 80240968 03E00008 */  jr        $ra
-/* D9DE3C 8024096C 27BD0150 */   addiu    $sp, $sp, 0x150
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
deleted file mode 100644
index e3d8c7044f..0000000000
--- a/ver/us/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F00_DE3390.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80240F00_DE3390
-/* DE3390 80240F00 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(omo_13_ItemChoice_HasSelectedItem)
-/* DE33A4 80240F14 AC201C04 */  sw        $zero, %lo(omo_13_ItemChoice_HasSelectedItem)($at)
-.L80240F18:
-/* 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)
-/* DE33BC 80240F2C 080903D2 */  j         .L80240F48
-/* DE33C0 80240F30 0000102D */   daddu    $v0, $zero, $zero
-.L80240F34:
-/* DE33C4 80240F34 8CC50000 */  lw        $a1, ($a2)
-/* DE33C8 80240F38 3C068024 */  lui       $a2, %hi(omo_13_ItemChoice_SelectedItemID)
-/* DE33CC 80240F3C 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* DE33DC 80240F4C 03E00008 */  jr        $ra
-/* DE33E0 80240F50 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
deleted file mode 100644
index 97d3cbbf03..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802411AC_D4E1EC
-/* D4E1EC 802411AC 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(pra_01_ItemChoice_HasSelectedItem)
-/* D4E200 802411C0 AC201F94 */  sw        $zero, %lo(pra_01_ItemChoice_HasSelectedItem)($at)
-.L802411C4:
-/* 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)
-/* D4E218 802411D8 0809047D */  j         .L802411F4
-/* D4E21C 802411DC 0000102D */   daddu    $v0, $zero, $zero
-.L802411E0:
-/* D4E220 802411E0 8CC50000 */  lw        $a1, ($a2)
-/* D4E224 802411E4 3C068024 */  lui       $a2, %hi(pra_01_ItemChoice_SelectedItemID)
-/* D4E228 802411E8 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* D4E238 802411F8 03E00008 */  jr        $ra
-/* D4E23C 802411FC 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
deleted file mode 100644
index 95189dd0d9..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024114C_D5113C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024114C_D5113C
-/* D5113C 8024114C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(pra_02_ItemChoice_HasSelectedItem)
-/* D51150 80241160 AC202ACC */  sw        $zero, %lo(pra_02_ItemChoice_HasSelectedItem)($at)
-.L80241164:
-/* 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)
-/* D51168 80241178 08090465 */  j         .L80241194
-/* D5116C 8024117C 0000102D */   daddu    $v0, $zero, $zero
-.L80241180:
-/* D51170 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D51174 80241184 3C068024 */  lui       $a2, %hi(pra_02_ItemChoice_SelectedItemID)
-/* D51178 80241188 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* D51188 80241198 03E00008 */  jr        $ra
-/* D5118C 8024119C 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
deleted file mode 100644
index 50cf049824..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024114C_D599DC.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024114C_D599DC
-/* D599DC 8024114C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(pra_09_ItemChoice_HasSelectedItem)
-/* D599F0 80241160 AC201D98 */  sw        $zero, %lo(pra_09_ItemChoice_HasSelectedItem)($at)
-.L80241164:
-/* 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)
-/* D59A08 80241178 08090465 */  j         .L80241194
-/* D59A0C 8024117C 0000102D */   daddu    $v0, $zero, $zero
-.L80241180:
-/* D59A10 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D59A14 80241184 3C068024 */  lui       $a2, %hi(pra_09_ItemChoice_SelectedItemID)
-/* D59A18 80241188 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* D59A28 80241198 03E00008 */  jr        $ra
-/* D59A2C 8024119C 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
deleted file mode 100644
index 4bfbb8dd5e..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024114C_D6572C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024114C_D6572C
-/* D6572C 8024114C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(pra_13_ItemChoice_HasSelectedItem)
-/* D65740 80241160 AC2022CC */  sw        $zero, %lo(pra_13_ItemChoice_HasSelectedItem)($at)
-.L80241164:
-/* 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)
-/* D65758 80241178 08090465 */  j         .L80241194
-/* D6575C 8024117C 0000102D */   daddu    $v0, $zero, $zero
-.L80241180:
-/* D65760 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D65764 80241184 3C068024 */  lui       $a2, %hi(pra_13_ItemChoice_SelectedItemID)
-/* D65768 80241188 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* D65778 80241198 03E00008 */  jr        $ra
-/* D6577C 8024119C 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
deleted file mode 100644
index 6c6a7e87ae..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024114C_D6FAFC
-/* D6FAFC 8024114C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(pra_19_ItemChoice_HasSelectedItem)
-/* D6FB10 80241160 AC20219C */  sw        $zero, %lo(pra_19_ItemChoice_HasSelectedItem)($at)
-.L80241164:
-/* 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)
-/* D6FB28 80241178 08090465 */  j         .L80241194
-/* D6FB2C 8024117C 0000102D */   daddu    $v0, $zero, $zero
-.L80241180:
-/* D6FB30 80241180 8CC50000 */  lw        $a1, ($a2)
-/* D6FB34 80241184 3C068024 */  lui       $a2, %hi(pra_19_ItemChoice_SelectedItemID)
-/* D6FB38 80241188 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* D6FB48 80241198 03E00008 */  jr        $ra
-/* D6FB4C 8024119C 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
deleted file mode 100644
index f72ff89435..0000000000
--- a/ver/us/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024024C_D7EFAC
-/* D7EFAC 8024024C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(pra_31_ItemChoice_HasSelectedItem)
-/* D7EFC0 80240260 AC20119C */  sw        $zero, %lo(pra_31_ItemChoice_HasSelectedItem)($at)
-.L80240264:
-/* 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)
-/* D7EFD8 80240278 080900A5 */  j         .L80240294
-/* D7EFDC 8024027C 0000102D */   daddu    $v0, $zero, $zero
-.L80240280:
-/* D7EFE0 80240280 8CC50000 */  lw        $a1, ($a2)
-/* D7EFE4 80240284 3C068024 */  lui       $a2, %hi(pra_31_ItemChoice_SelectedItemID)
-/* D7EFE8 80240288 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* D7EFF8 80240298 03E00008 */  jr        $ra
-/* D7EFFC 8024029C 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
deleted file mode 100644
index d30b02dc55..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024053C_CF80AC
-/* CF80AC 8024053C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(sam_01_ItemChoice_HasSelectedItem)
-/* CF80C0 80240550 AC2032D0 */  sw        $zero, %lo(sam_01_ItemChoice_HasSelectedItem)($at)
-.L80240554:
-/* 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)
-/* CF80D8 80240568 08090161 */  j         .L80240584
-/* CF80DC 8024056C 0000102D */   daddu    $v0, $zero, $zero
-.L80240570:
-/* CF80E0 80240570 8CC50000 */  lw        $a1, ($a2)
-/* CF80E4 80240574 3C068024 */  lui       $a2, %hi(sam_01_ItemChoice_SelectedItemID)
-/* CF80E8 80240578 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* CF80F8 80240588 03E00008 */  jr        $ra
-/* CF80FC 8024058C 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
deleted file mode 100644
index 197a7a34bb..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024053C_D13B0C
-/* D13B0C 8024053C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(sam_04_ItemChoice_HasSelectedItem)
-/* D13B20 80240550 AC20387C */  sw        $zero, %lo(sam_04_ItemChoice_HasSelectedItem)($at)
-.L80240554:
-/* 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)
-/* D13B38 80240568 08090161 */  j         .L80240584
-/* D13B3C 8024056C 0000102D */   daddu    $v0, $zero, $zero
-.L80240570:
-/* D13B40 80240570 8CC50000 */  lw        $a1, ($a2)
-/* D13B44 80240574 3C068024 */  lui       $a2, %hi(sam_04_ItemChoice_SelectedItemID)
-/* D13B48 80240578 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* D13B58 80240588 03E00008 */  jr        $ra
-/* D13B5C 8024058C 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
deleted file mode 100644
index 0ad2382c61..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s
+++ /dev/null
@@ -1,28 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80241D8C_D21C1C
-/* D21C1C 80241D8C 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 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(sam_06_ItemChoice_HasSelectedItem)
-/* D21C30 80241DA0 AC204434 */  sw        $zero, %lo(sam_06_ItemChoice_HasSelectedItem)($at)
-.L80241DA4:
-/* 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)
-/* D21C48 80241DB8 08090775 */  j         .L80241DD4
-/* D21C4C 80241DBC 0000102D */   daddu    $v0, $zero, $zero
-.L80241DC0:
-/* D21C50 80241DC0 8CC50000 */  lw        $a1, ($a2)
-/* D21C54 80241DC4 3C068024 */  lui       $a2, %hi(sam_06_ItemChoice_SelectedItemID)
-/* D21C58 80241DC8 0C0B2026 */  jal       evt_set_variable
-/* 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)
-/* D21C68 80241DD8 03E00008 */  jr        $ra
-/* D21C6C 80241DDC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s
deleted file mode 100644
index 243df11501..0000000000
--- a/ver/us/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241DAC_D3C37C.s
+++ /dev/null
@@ -1,144 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-.section .rodata
-
-dlabel D_80251430_D4BA00
-.double 0.1
-
-dlabel D_80251438_D4BA08
-.double 0.2
-
-.section .text
-
-glabel func_80241DAC_D3C37C
-/* D3C37C 80241DAC 27BDFFB0 */  addiu     $sp, $sp, -0x50
-/* D3C380 80241DB0 F7BC0048 */  sdc1      $f28, 0x48($sp)
-/* D3C384 80241DB4 4480E000 */  mtc1      $zero, $f28
-/* D3C388 80241DB8 F7BA0040 */  sdc1      $f26, 0x40($sp)
-/* D3C38C 80241DBC 3C018025 */  lui       $at, %hi(D_80251430_D4BA00)
-/* D3C390 80241DC0 D43A1430 */  ldc1      $f26, %lo(D_80251430_D4BA00)($at)
-/* D3C394 80241DC4 AFB1001C */  sw        $s1, 0x1c($sp)
-/* D3C398 80241DC8 0000882D */  daddu     $s1, $zero, $zero
-/* D3C39C 80241DCC AFB20020 */  sw        $s2, 0x20($sp)
-/* D3C3A0 80241DD0 0220902D */  daddu     $s2, $s1, $zero
-/* D3C3A4 80241DD4 AFBF0024 */  sw        $ra, 0x24($sp)
-/* D3C3A8 80241DD8 AFB00018 */  sw        $s0, 0x18($sp)
-/* D3C3AC 80241DDC F7B80038 */  sdc1      $f24, 0x38($sp)
-/* D3C3B0 80241DE0 F7B60030 */  sdc1      $f22, 0x30($sp)
-/* D3C3B4 80241DE4 F7B40028 */  sdc1      $f20, 0x28($sp)
-.L80241DE8:
-/* D3C3B8 80241DE8 3C022AAA */  lui       $v0, 0x2aaa
-/* D3C3BC 80241DEC 3442AAAB */  ori       $v0, $v0, 0xaaab
-/* D3C3C0 80241DF0 02220018 */  mult      $s1, $v0
-/* D3C3C4 80241DF4 001127C3 */  sra       $a0, $s1, 0x1f
-/* D3C3C8 80241DF8 00004010 */  mfhi      $t0
-/* D3C3CC 80241DFC 01042023 */  subu      $a0, $t0, $a0
-/* D3C3D0 80241E00 00041840 */  sll       $v1, $a0, 1
-/* D3C3D4 80241E04 00641821 */  addu      $v1, $v1, $a0
-/* D3C3D8 80241E08 00031840 */  sll       $v1, $v1, 1
-/* D3C3DC 80241E0C 02231823 */  subu      $v1, $s1, $v1
-/* D3C3E0 80241E10 00031080 */  sll       $v0, $v1, 2
-/* D3C3E4 80241E14 00431021 */  addu      $v0, $v0, $v1
-/* D3C3E8 80241E18 000210C0 */  sll       $v0, $v0, 3
-/* D3C3EC 80241E1C 2442FF9C */  addiu     $v0, $v0, -0x64
-/* D3C3F0 80241E20 4482C000 */  mtc1      $v0, $f24
-/* D3C3F4 80241E24 00000000 */  nop
-/* D3C3F8 80241E28 4680C620 */  cvt.s.w   $f24, $f24
-/* D3C3FC 80241E2C 4600C1A1 */  cvt.d.s   $f6, $f24
-/* D3C400 80241E30 463A3182 */  mul.d     $f6, $f6, $f26
-/* D3C404 80241E34 00000000 */  nop
-/* D3C408 80241E38 00041080 */  sll       $v0, $a0, 2
-/* D3C40C 80241E3C 00441021 */  addu      $v0, $v0, $a0
-/* D3C410 80241E40 000210C0 */  sll       $v0, $v0, 3
-/* D3C414 80241E44 2442FF9C */  addiu     $v0, $v0, -0x64
-/* D3C418 80241E48 4482B000 */  mtc1      $v0, $f22
-/* D3C41C 80241E4C 00000000 */  nop
-/* D3C420 80241E50 4680B5A0 */  cvt.s.w   $f22, $f22
-/* D3C424 80241E54 4600B121 */  cvt.d.s   $f4, $f22
-/* D3C428 80241E58 463A2102 */  mul.d     $f4, $f4, $f26
-/* D3C42C 80241E5C 00000000 */  nop
-/* D3C430 80241E60 3C013FF0 */  lui       $at, 0x3ff0
-/* D3C434 80241E64 44811800 */  mtc1      $at, $f3
-/* D3C438 80241E68 44801000 */  mtc1      $zero, $f2
-/* D3C43C 80241E6C 32220003 */  andi      $v0, $s1, 3
-/* D3C440 80241E70 44820000 */  mtc1      $v0, $f0
-/* D3C444 80241E74 00000000 */  nop
-/* D3C448 80241E78 46800021 */  cvt.d.w   $f0, $f0
-/* D3C44C 80241E7C 46220000 */  add.d     $f0, $f0, $f2
-/* D3C450 80241E80 4480A000 */  mtc1      $zero, $f20
-/* D3C454 80241E84 3C06C120 */  lui       $a2, 0xc120
-/* D3C458 80241E88 46200000 */  add.d     $f0, $f0, $f0
-/* D3C45C 80241E8C 32240001 */  andi      $a0, $s1, 1
-/* D3C460 80241E90 00021080 */  sll       $v0, $v0, 2
-/* D3C464 80241E94 4614C080 */  add.s     $f2, $f24, $f20
-/* D3C468 80241E98 46200020 */  cvt.s.d   $f0, $f0
-/* D3C46C 80241E9C E7A00010 */  swc1      $f0, 0x10($sp)
-/* D3C470 80241EA0 3C01437A */  lui       $at, 0x437a
-/* D3C474 80241EA4 44810000 */  mtc1      $at, $f0
-/* D3C478 80241EA8 2442001E */  addiu     $v0, $v0, 0x1e
-/* D3C47C 80241EAC AFA20014 */  sw        $v0, 0x14($sp)
-/* D3C480 80241EB0 4600B000 */  add.s     $f0, $f22, $f0
-/* D3C484 80241EB4 44051000 */  mfc1      $a1, $f2
-/* D3C488 80241EB8 46203620 */  cvt.s.d   $f24, $f6
-/* D3C48C 80241EBC 44070000 */  mfc1      $a3, $f0
-/* D3C490 80241EC0 0C01C994 */  jal       fx_ice_shard
-/* D3C494 80241EC4 462025A0 */   cvt.s.d  $f22, $f4
-/* D3C498 80241EC8 0040802D */  daddu     $s0, $v0, $zero
-/* D3C49C 80241ECC 8E02000C */  lw        $v0, 0xc($s0)
-/* D3C4A0 80241ED0 2404000A */  addiu     $a0, $zero, 0xa
-/* D3C4A4 80241ED4 0C00A67F */  jal       rand_int
-/* D3C4A8 80241ED8 E45C0044 */   swc1     $f28, 0x44($v0)
-/* D3C4AC 80241EDC 3C018025 */  lui       $at, %hi(D_80251438_D4BA08)
-/* D3C4B0 80241EE0 D4221438 */  ldc1      $f2, %lo(D_80251438_D4BA08)($at)
-/* D3C4B4 80241EE4 44820000 */  mtc1      $v0, $f0
-/* D3C4B8 80241EE8 00000000 */  nop
-/* D3C4BC 80241EEC 46800021 */  cvt.d.w   $f0, $f0
-/* D3C4C0 80241EF0 46220002 */  mul.d     $f0, $f0, $f2
-/* D3C4C4 80241EF4 00000000 */  nop
-/* D3C4C8 80241EF8 2404000A */  addiu     $a0, $zero, 0xa
-/* D3C4CC 80241EFC 463A0000 */  add.d     $f0, $f0, $f26
-/* D3C4D0 80241F00 3C014080 */  lui       $at, 0x4080
-/* D3C4D4 80241F04 4481A000 */  mtc1      $at, $f20
-/* D3C4D8 80241F08 8E02000C */  lw        $v0, 0xc($s0)
-/* D3C4DC 80241F0C 46200020 */  cvt.s.d   $f0, $f0
-/* D3C4E0 80241F10 E4400048 */  swc1      $f0, 0x48($v0)
-/* D3C4E4 80241F14 8E02000C */  lw        $v0, 0xc($s0)
-/* D3C4E8 80241F18 44920000 */  mtc1      $s2, $f0
-/* D3C4EC 80241F1C 00000000 */  nop
-/* D3C4F0 80241F20 46800020 */  cvt.s.w   $f0, $f0
-/* D3C4F4 80241F24 0C00A67F */  jal       rand_int
-/* D3C4F8 80241F28 E440003C */   swc1     $f0, 0x3c($v0)
-/* D3C4FC 80241F2C 2442FFFB */  addiu     $v0, $v0, -5
-/* D3C500 80241F30 8E03000C */  lw        $v1, 0xc($s0)
-/* D3C504 80241F34 44820000 */  mtc1      $v0, $f0
-/* D3C508 80241F38 00000000 */  nop
-/* D3C50C 80241F3C 46800020 */  cvt.s.w   $f0, $f0
-/* D3C510 80241F40 E4600040 */  swc1      $f0, 0x40($v1)
-/* D3C514 80241F44 8E02000C */  lw        $v0, 0xc($s0)
-/* D3C518 80241F48 3C01BDCC */  lui       $at, 0xbdcc
-/* D3C51C 80241F4C 3421CCCD */  ori       $at, $at, 0xcccd
-/* D3C520 80241F50 44810000 */  mtc1      $at, $f0
-/* D3C524 80241F54 E458004C */  swc1      $f24, 0x4c($v0)
-/* D3C528 80241F58 8E02000C */  lw        $v0, 0xc($s0)
-/* D3C52C 80241F5C E4540050 */  swc1      $f20, 0x50($v0)
-/* D3C530 80241F60 8E02000C */  lw        $v0, 0xc($s0)
-/* D3C534 80241F64 26310001 */  addiu     $s1, $s1, 1
-/* D3C538 80241F68 E4560054 */  swc1      $f22, 0x54($v0)
-/* D3C53C 80241F6C 8E02000C */  lw        $v0, 0xc($s0)
-/* D3C540 80241F70 E4400058 */  swc1      $f0, 0x58($v0)
-/* D3C544 80241F74 2A220018 */  slti      $v0, $s1, 0x18
-/* D3C548 80241F78 1440FF9B */  bnez      $v0, .L80241DE8
-/* D3C54C 80241F7C 26520023 */   addiu    $s2, $s2, 0x23
-/* D3C550 80241F80 8FBF0024 */  lw        $ra, 0x24($sp)
-/* D3C554 80241F84 8FB20020 */  lw        $s2, 0x20($sp)
-/* D3C558 80241F88 8FB1001C */  lw        $s1, 0x1c($sp)
-/* D3C55C 80241F8C 8FB00018 */  lw        $s0, 0x18($sp)
-/* D3C560 80241F90 D7BC0048 */  ldc1      $f28, 0x48($sp)
-/* D3C564 80241F94 D7BA0040 */  ldc1      $f26, 0x40($sp)
-/* D3C568 80241F98 D7B80038 */  ldc1      $f24, 0x38($sp)
-/* D3C56C 80241F9C D7B60030 */  ldc1      $f22, 0x30($sp)
-/* D3C570 80241FA0 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* D3C574 80241FA4 24020002 */  addiu     $v0, $zero, 2
-/* D3C578 80241FA8 03E00008 */  jr        $ra
-/* D3C57C 80241FAC 27BD0050 */   addiu    $sp, $sp, 0x50
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index df16cb4434..7a9184b823 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -17670,7 +17670,7 @@ nok_01_Quizmo_CreateReactionEffect = 0x80241D60; // type:func rom:0x9C7140
 nok_01_Quizmo_CreateWorker = 0x80241DCC; // type:func rom:0x9C71AC
 nok_01_GetNpcCollisionHeight = 0x80241DFC; // type:func rom:0x9C71DC
 nok_01_AddPlayerHandsOffset = 0x80241E58; // type:func rom:0x9C7238
-func_80242028_9C7408 = 0x80242028; // type:func rom:0x9C7408
+nok_01_ItemChoice_WaitForSelection = 0x80242028; // type:func rom:0x9C7408
 func_8024207C_9C745C = 0x8024207C; // type:func rom:0x9C745C
 func_802420B4_9C7494 = 0x802420B4; // type:func rom:0x9C7494
 nok_01_LetterDelivery_Init = 0x80242150; // type:func rom:0x9C7530
@@ -17710,7 +17710,7 @@ dup_nok_02_StashVars = 0x802402E0; // type:func rom:0x9D7300
 dup_nok_02_GetItemName = 0x80240394; // type:func rom:0x9D73B4
 dup_nok_02_GetNpcCollisionHeight = 0x802403F8; // type:func rom:0x9D7418
 dup_nok_02_AddPlayerHandsOffset = 0x80240454; // type:func rom:0x9D7474
-func_80240624_9D7644 = 0x80240624; // type:func rom:0x9D7644
+nok_02_ItemChoice_WaitForSelection = 0x80240624; // type:func rom:0x9D7644
 func_80240678_9D7698 = 0x80240678; // type:func rom:0x9D7698
 func_802406B0_9D76D0 = 0x802406B0; // type:func rom:0x9D76D0
 nok_02_ItemEntityJumpToPos = 0x80240750; // type:func rom:0x9D7770
@@ -17756,7 +17756,7 @@ nok_02_Quizmo_CreateReactionEffect = 0x80242908; // type:func rom:0x9D9928
 nok_02_Quizmo_CreateWorker = 0x80242974; // type:func rom:0x9D9994
 nok_02_GetNpcCollisionHeight = 0x802429A4; // type:func rom:0x9D99C4
 nok_02_AddPlayerHandsOffset = 0x80242A00; // type:func rom:0x9D9A20
-func_80242BD0_9D9BF0 = 0x80242BD0; // type:func rom:0x9D9BF0
+dup_nok_02_ItemChoice_WaitForSelection = 0x80242BD0; // type:func rom:0x9D9BF0
 func_80242C24_9D9C44 = 0x80242C24; // type:func rom:0x9D9C44
 func_80242C5C_9D9C7C = 0x80242C5C; // type:func rom:0x9D9C7C
 nok_02_LetterDelivery_Init = 0x80242CF8; // type:func rom:0x9D9D18
@@ -17773,7 +17773,7 @@ func_80243754_9DA774 = 0x80243754; // type:func rom:0x9DA774
 func_802438D0_9DA8F0 = 0x802438D0; // type:func rom:0x9DA8F0
 dup2_nok_02_GetNpcCollisionHeight = 0x802439C0; // type:func rom:0x9DA9E0
 dup2_nok_02_AddPlayerHandsOffset = 0x80243A1C; // type:func rom:0x9DAA3C
-func_80243BEC_9DAC0C = 0x80243BEC; // type:func rom:0x9DAC0C
+dup2_nok_02_ItemChoice_WaitForSelection = 0x80243BEC; // type:func rom:0x9DAC0C
 func_80243C40_9DAC60 = 0x80243C40; // type:func rom:0x9DAC60
 func_80243C78_9DAC98 = 0x80243C78; // type:func rom:0x9DAC98
 func_80243D14_9DAD34 = 0x80243D14; // type:func rom:0x9DAD34
@@ -18320,7 +18320,7 @@ hos_06_StashVars = 0x80240310; // type:func rom:0xA397F0
 dup2_hos_06_GetItemName = 0x802403C4; // type:func rom:0xA398A4
 dup_hos_06_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xA39908
 dup_hos_06_AddPlayerHandsOffset = 0x80240484; // type:func rom:0xA39964
-func_80240654_A39B34 = 0x80240654; // type:func rom:0xA39B34
+hos_06_ItemChoice_WaitForSelection = 0x80240654; // type:func rom:0xA39B34
 func_802406A8_A39B88 = 0x802406A8; // type:func rom:0xA39B88
 func_802406E0_A39BC0 = 0x802406E0; // type:func rom:0xA39BC0
 hos_06_LetterDelivery_Init = 0x8024077C; // type:func rom:0xA39C5C
@@ -18333,7 +18333,7 @@ Merlow_ShopBadgesPopup = 0x80240AD0; // type:func rom:0xA39FB0
 func_80240D30_A3A210 = 0x80240D30; // type:func rom:0xA3A210
 hos_06_GetNpcCollisionHeight = 0x80240D50; // type:func rom:0xA3A230
 hos_06_AddPlayerHandsOffset = 0x80240DAC; // type:func rom:0xA3A28C
-func_80240F7C_A3A45C = 0x80240F7C; // type:func rom:0xA3A45C
+dup_hos_06_ItemChoice_WaitForSelection = 0x80240F7C; // type:func rom:0xA3A45C
 func_80240FD0_A3A4B0 = 0x80240FD0; // type:func rom:0xA3A4B0
 func_80241008_A3A4E8 = 0x80241008; // type:func rom:0xA3A4E8
 dup_hos_06_StashVars = 0x802410A4; // type:func rom:0xA3A584
@@ -19088,7 +19088,7 @@ kkj_18_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xAF2DC4
 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
+kkj_18_ItemChoice_WaitForSelection = 0x8024056C; // type:func rom:0xAF320C
 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
@@ -19104,7 +19104,7 @@ func_80240178_AF7AC8 = 0x80240178; // type:func rom:0xAF7AC8
 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
+kkj_19_ItemChoice_WaitForSelection = 0x802404DC; // type:func rom:0xAF7E2C
 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
@@ -19290,7 +19290,7 @@ jan_02_PatrolNoAttackAI_15 = 0x80240F04; // type:func rom:0xB2D374
 jan_02_PatrolNoAttackAI_Main = 0x80240FC4; // type:func rom:0xB2D434
 jan_02_GetNpcCollisionHeight = 0x802412C0; // type:func rom:0xB2D730
 jan_02_AddPlayerHandsOffset = 0x8024131C; // type:func rom:0xB2D78C
-func_802414EC_B2D95C = 0x802414EC; // type:func rom:0xB2D95C
+jan_02_ItemChoice_WaitForSelection = 0x802414EC; // type:func rom:0xB2D95C
 func_80241540_B2D9B0 = 0x80241540; // type:func rom:0xB2D9B0
 func_80241578_B2D9E8 = 0x80241578; // type:func rom:0xB2D9E8
 jan_02_StashVars = 0x80241614; // type:func rom:0xB2DA84
@@ -19366,7 +19366,7 @@ jan_03_ToadHouse_GetPartnerBackOut = 0x80241774; // type:func rom:0xB36344
 jan_03_ToadHouse_Stub = 0x802417A4; // type:func rom:0xB36374
 jan_03_GetNpcCollisionHeight = 0x802417AC; // type:func rom:0xB3637C
 jan_03_AddPlayerHandsOffset = 0x80241808; // type:func rom:0xB363D8
-func_802419D8_B365A8 = 0x802419D8; // type:func rom:0xB365A8
+jan_03_ItemChoice_WaitForSelection = 0x802419D8; // type:func rom:0xB365A8
 func_80241A2C_B365FC = 0x80241A2C; // type:func rom:0xB365FC
 func_80241A64_B36634 = 0x80241A64; // type:func rom:0xB36634
 func_80241B00_B366D0 = 0x80241B00; // type:func rom:0xB366D0
@@ -23610,7 +23610,7 @@ sam_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCF7B70
 sam_01_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xCF7C94
 sam_01_GetNpcCollisionHeight = 0x80240310; // type:func rom:0xCF7E80
 sam_01_AddPlayerHandsOffset = 0x8024036C; // type:func rom:0xCF7EDC
-func_8024053C_CF80AC = 0x8024053C; // type:func rom:0xCF80AC
+sam_01_ItemChoice_WaitForSelection = 0x8024053C; // type:func rom:0xCF80AC
 func_80240590_CF8100 = 0x80240590; // type:func rom:0xCF8100
 func_802405C8_CF8138 = 0x802405C8; // type:func rom:0xCF8138
 func_80240664_CF81D4 = 0x80240664; // type:func rom:0xCF81D4
@@ -23723,7 +23723,7 @@ sam_04_TransformFoliage = 0x80240070; // type:func rom:0xD13640
 sam_04_SetAngleClamped = 0x80240240; // type:func rom:0xD13810
 sam_04_GetNpcCollisionHeight = 0x80240310; // type:func rom:0xD138E0
 sam_04_AddPlayerHandsOffset = 0x8024036C; // type:func rom:0xD1393C
-func_8024053C_D13B0C = 0x8024053C; // type:func rom:0xD13B0C
+sam_04_ItemChoice_WaitForSelection = 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
@@ -23773,7 +23773,7 @@ sam_06_StashVars = 0x80241A48; // type:func rom:0xD218D8
 sam_06_GetItemName = 0x80241AFC; // type:func rom:0xD2198C
 sam_06_GetNpcCollisionHeight = 0x80241B60; // type:func rom:0xD219F0
 sam_06_AddPlayerHandsOffset = 0x80241BBC; // type:func rom:0xD21A4C
-func_80241D8C_D21C1C = 0x80241D8C; // type:func rom:0xD21C1C
+sam_06_ItemChoice_WaitForSelection = 0x80241D8C; // type:func rom:0xD21C1C
 func_80241DE0_D21C70 = 0x80241DE0; // type:func rom:0xD21C70
 func_80241E18_D21CA8 = 0x80241E18; // type:func rom:0xD21CA8
 func_80241EB4_D21D44 = 0x80241EB4; // type:func rom:0xD21D44
@@ -23965,7 +23965,7 @@ pra_01_UnkFogFunc = 0x80240F20; // type:func rom:0xD4DF60
 func_80240F60_D4DFA0 = 0x80240F60; // type:func rom:0xD4DFA0
 pra_01_GetNpcCollisionHeight = 0x80240F80; // type:func rom:0xD4DFC0
 pra_01_AddPlayerHandsOffset = 0x80240FDC; // type:func rom:0xD4E01C
-func_802411AC_D4E1EC = 0x802411AC; // type:func rom:0xD4E1EC
+pra_01_ItemChoice_WaitForSelection = 0x802411AC; // type:func rom:0xD4E1EC
 func_80241200_D4E240 = 0x80241200; // type:func rom:0xD4E240
 func_80241238_D4E278 = 0x80241238; // type:func rom:0xD4E278
 func_802412D4_D4E314 = 0x802412D4; // type:func rom:0xD4E314
@@ -23988,7 +23988,7 @@ pra_02_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD50EA8
 pra_02_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD50EDC
 pra_02_GetNpcCollisionHeight = 0x80240F20; // type:func rom:0xD50F10
 pra_02_AddPlayerHandsOffset = 0x80240F7C; // type:func rom:0xD50F6C
-func_8024114C_D5113C = 0x8024114C; // type:func rom:0xD5113C
+pra_02_ItemChoice_WaitForSelection = 0x8024114C; // type:func rom:0xD5113C
 func_802411A0_D51190 = 0x802411A0; // type:func rom:0xD51190
 func_802411D8_D511C8 = 0x802411D8; // type:func rom:0xD511C8
 func_80241274_D51264 = 0x80241274; // type:func rom:0xD51264
@@ -24062,7 +24062,7 @@ pra_09_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD59748
 pra_09_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD5977C
 pra_09_GetNpcCollisionHeight = 0x80240F20; // type:func rom:0xD597B0
 pra_09_AddPlayerHandsOffset = 0x80240F7C; // type:func rom:0xD5980C
-func_8024114C_D599DC = 0x8024114C; // type:func rom:0xD599DC
+pra_09_ItemChoice_WaitForSelection = 0x8024114C; // type:func rom:0xD599DC
 func_802411A0_D59A30 = 0x802411A0; // type:func rom:0xD59A30
 func_802411D8_D59A68 = 0x802411D8; // type:func rom:0xD59A68
 func_80241274_D59B04 = 0x80241274; // type:func rom:0xD59B04
@@ -24145,7 +24145,7 @@ pra_13_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD65498
 pra_13_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD654CC
 pra_13_GetNpcCollisionHeight = 0x80240F20; // type:func rom:0xD65500
 pra_13_AddPlayerHandsOffset = 0x80240F7C; // type:func rom:0xD6555C
-func_8024114C_D6572C = 0x8024114C; // type:func rom:0xD6572C
+pra_13_ItemChoice_WaitForSelection = 0x8024114C; // type:func rom:0xD6572C
 func_802411A0_D65780 = 0x802411A0; // type:func rom:0xD65780
 func_802411D8_D657B8 = 0x802411D8; // type:func rom:0xD657B8
 func_80241274_D65854 = 0x80241274; // type:func rom:0xD65854
@@ -24221,7 +24221,7 @@ pra_19_worker_reflect_partner_floor = 0x80240EB8; // type:func rom:0xD6F868
 pra_19_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD6F89C
 pra_19_GetNpcCollisionHeight = 0x80240F20; // type:func rom:0xD6F8D0
 pra_19_AddPlayerHandsOffset = 0x80240F7C; // type:func rom:0xD6F92C
-func_8024114C_D6FAFC = 0x8024114C; // type:func rom:0xD6FAFC
+pra_19_ItemChoice_WaitForSelection = 0x8024114C; // type:func rom:0xD6FAFC
 func_802411A0_D6FB50 = 0x802411A0; // type:func rom:0xD6FB50
 func_802411D8_D6FB88 = 0x802411D8; // type:func rom:0xD6FB88
 func_80241274_D6FC24 = 0x80241274; // type:func rom:0xD6FC24
@@ -24320,7 +24320,7 @@ pra_29_PlayRisingBubble = 0x802411D4; // type:func rom:0xD7DD24
 func_80240000_D7ED60 = 0x80240000; // type:func rom:0xD7ED60
 pra_31_GetNpcCollisionHeight = 0x80240020; // type:func rom:0xD7ED80
 pra_31_AddPlayerHandsOffset = 0x8024007C; // type:func rom:0xD7EDDC
-func_8024024C_D7EFAC = 0x8024024C; // type:func rom:0xD7EFAC
+pra_31_ItemChoice_WaitForSelection = 0x8024024C; // type:func rom:0xD7EFAC
 func_802402A0_D7F000 = 0x802402A0; // type:func rom:0xD7F000
 func_802402D8_D7F038 = 0x802402D8; // type:func rom:0xD7F038
 func_80240374_D7F0D4 = 0x80240374; // type:func rom:0xD7F0D4
@@ -24856,7 +24856,7 @@ omo_13_GrooveGuyAI_03 = 0x8024083C; // type:func rom:0xDE2CCC
 omo_13_GrooveGuyAI_Main = 0x80240A00; // type:func rom:0xDE2E90
 omo_13_GetNpcCollisionHeight = 0x80240CD4; // type:func rom:0xDE3164
 omo_13_AddPlayerHandsOffset = 0x80240D30; // type:func rom:0xDE31C0
-func_80240F00_DE3390 = 0x80240F00; // type:func rom:0xDE3390
+omo_13_ItemChoice_WaitForSelection = 0x80240F00; // type:func rom:0xDE3390
 func_80240F54_DE33E4 = 0x80240F54; // type:func rom:0xDE33E4
 func_80240F8C_DE341C = 0x80240F8C; // type:func rom:0xDE341C
 func_80241028_DE34B8 = 0x80241028; // type:func rom:0xDE34B8