diff --git a/include/common_structs.h b/include/common_structs.h
index a9cabc1d1f..aa5f7184f7 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -907,8 +907,8 @@ typedef struct PrintHandle {
 
 typedef struct OtherPrint {
     /* 0x00 */ char unk_00[16];
-    /* 0x10 */ f32 stringScaleH;
-    /* 0x14 */ f32 stringScaleW;
+    /* 0x10 */ f32 msgScaleH;
+    /* 0x14 */ f32 msgScaleW;
     /* 0x18 */ f32 characterScaleH;
     /* 0x1C */ f32 characterScaleW;
     /* 0x20 */ char unk_20[32];
@@ -923,14 +923,14 @@ typedef struct ColliderBoundingBox {
 } ColliderBoundingBox; // size = 0x1C
 
 typedef struct StaticItem {
-    /* 0x00 */ s32 nameString;
+    /* 0x00 */ s32 nameMsg;
     /* 0x04 */ s16 iconID;
     /* 0x06 */ s16 badgeSortPriority;
     /* 0x08 */ s32 targetFlags;
     /* 0x0C */ s16 sellValue;
     /* 0x0E */ char unk_0E[2];
-    /* 0x10 */ s32 menuString;
-    /* 0x14 */ s32 itemString;
+    /* 0x10 */ s32 menuMsg;
+    /* 0x14 */ s32 itemMsg;
     /* 0x18 */ s16 typeFlags;
     /* 0x1A */ u8 moveID;
     /* 0x1B */ s8 potencyA;
@@ -1064,7 +1064,7 @@ typedef struct MessagePrintState {
     /* 0x000 */ s8* srcBuffer;
     /* 0x004 */ s16 printBufferPos;
     /* 0x006 */ char unk_06[2];
-    /* 0x008 */ s32 stringID;
+    /* 0x008 */ s32 msgID;
     /* 0x00C */ s16 srcBufferPos;
     /* 0x00E */ s16 currentPrintDelay;
     /* 0x010 */ u8 printBuffer[1088]; // slightly larger than source buffer
@@ -1139,8 +1139,8 @@ typedef struct MessagePrintState {
     /* 0x532 */ s8 varImgAlphaFadeStep; // how much to fade in per frame
     /* 0x533 */ s8 varImageDisplayState; // 0 = fade in, 1 = fully visible, 2 = fade out
     /* 0x534 */ s16 varImageFadeTimer; // frames faded in
-    /* 0x536 */ s16 stringHeight;
-    /* 0x538 */ s16 stringWidth;
+    /* 0x536 */ s16 msgHeight;
+    /* 0x538 */ s16 msgWidth;
     /* 0x53A */ s8 maxLineChars;
     /* 0x53B */ s8 numLines;
     /* 0x53C */ s8 maxLinesPerPage;
@@ -1156,9 +1156,9 @@ typedef struct MessagePrintState {
 typedef struct MessageDrawState {
     /* 0x00 */ s32 clipX[2]; // characters beyond this pos get skipped
     /* 0x08 */ s32 clipY[2]; // characters beyond this pos get skipped
-    /* 0x10 */ Vec2f stringScale;
+    /* 0x10 */ Vec2f msgScale;
     /* 0x18 */ Vec2f charScale;
-    /* 0x20 */ s32 drawBufferPos; // string gets printed here and read for display
+    /* 0x20 */ s32 drawBufferPos; // msg gets printed here and read for display
     /* 0x24 */ s16 savedPos[2];
     /* 0x28 */ s8 savedColor;
     /* 0x29 */ u8 unk_29;
@@ -1565,7 +1565,7 @@ typedef struct ShopOwner {
     /* 0x0C */ char unk_0C[0x4];
     /* 0x10 */ Bytecode* unkScript;
     /* 0x14 */ char unk_14[0x4];
-    /* 0x18 */ s32* shopStringIDs;
+    /* 0x18 */ s32* shopMsgIDs;
 } ShopOwner;
 
 typedef struct ShopItemLocation {
@@ -1588,7 +1588,7 @@ typedef struct StaticPriceItem {
 typedef struct PopupMenu {
     /* 0x000 */ s32* ptrIcon[32];
     /* 0x080 */ char unk_80[4];
-    /* 0x084 */ s32 nameString[32];
+    /* 0x084 */ s32 nameMsg[32];
     /* 0x104 */ char unk_104[4];
     /* 0x108 */ s32 userIndex[32]; // used to map menu order to a user-ID for each item
     /* 0x188 */ char unk_188[4];
@@ -1596,7 +1596,7 @@ typedef struct PopupMenu {
     /* 0x20C */ char unk_20C[4];
     /* 0x210 */ s32 value[32]; // sale price, etc
     /* 0x290 */ char unk_290[4];
-    /* 0x294 */ s32 descString[32];
+    /* 0x294 */ s32 descMsg[32];
     /* 0x314 */ char unk_314[4];
     /* 0x318 */ s32 popupType; // C = keys
     /* 0x31C */ s32 unk_31C;
diff --git a/include/functions.h b/include/functions.h
index bee1fb53ab..03d1048ee6 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -114,7 +114,7 @@ void entity_HugeBlueSwitch_init(Entity* entity);
 s32 dispatch_damage_event_actor_0(Actor* actor, s32 damageAmount, s32 event);
 
 // Text
-MessagePrintState* msg_get_printer_for_string(s32 stringID, s32* a1);
+MessagePrintState* msg_get_printer_for_msg(s32 msgID, s32* a1);
 
 void get_screen_coords(s32 camID, f32 x, f32 y, f32 z, s32* screenX, s32* screenY, s32* screenZ);
 
@@ -133,7 +133,7 @@ void peach_set_disguise_anim(s32);
 void draw_box(s32 flags, s32 windowStyle, s32 posX, s32 posY, s32 posZ, s32 width, s32 height, s32 opacity,
               s32 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, void (*fpDrawContents)(s32),
               s32 drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, Matrix4f* outMtx);
-s32 get_string_width(s32 stringID, u16 charset);
+s32 get_msg_width(s32 msgID, u16 charset);
 
 s32 partner_player_can_pause(void);
 s32 disable_player_static_collisions(void);
@@ -475,7 +475,7 @@ void mdl_draw_hidden_panel_surface(Gfx** arg0, u16 treeIndex);
 s32 func_8011CFBC(void);
 s32 set_screen_overlay_center_worldpos(void);
 s32 mdl_get_next_texture_address(void);
-void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style);
+void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style);
 void get_background_color_blend(u8* r, u8* g, u8* b, u8* a);
 
 s32 entity_base_block_idle(Entity* entity);
diff --git a/include/map.h b/include/map.h
index c537ebdf32..b1a8186cde 100644
--- a/include/map.h
+++ b/include/map.h
@@ -316,7 +316,7 @@ typedef struct Enemy {
     /* 0xCC */ s32* animList;
     /* 0xD0 */ EnemyTerritory* territory;
     /* 0xD4 */ EnemyDrops* drops;
-    /* 0xD8 */ u32 tattleString;
+    /* 0xD8 */ u32 tattleMsg;
     /* 0xDC */ char unk_DC[20];
 } Enemy; // size = 0xF0
 
diff --git a/include/script_api/common.h b/include/script_api/common.h
index 21bb4fbf5a..a3d1f90eed 100644
--- a/include/script_api/common.h
+++ b/include/script_api/common.h
@@ -163,7 +163,7 @@ ApiStatus CloseChoice(Evt* script, s32 isInitialCall);
 ApiStatus CancelMessage(Evt* script, s32 isInitialCall);
 ApiStatus CancelMessageAndBlock(void); // ???
 ApiStatus SetMessageImages(Evt* script, s32 isInitialCall);
-ApiStatus SetMessageString(Evt* script, s32 isInitialCall);
+ApiStatus SetMessageMsg(Evt* script, s32 isInitialCall);
 ApiStatus SetMessageValue(Evt* script, s32 isInitialCall);
 ApiStatus HidePlayerShadow(Evt* script, s32 isInitialCall);
 ApiStatus DisablePlayerPhysics(Evt* script, s32 isInitialCall);
diff --git a/include/variables.h b/include/variables.h
index d1d707d051..d25108eef0 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -173,7 +173,7 @@ extern s32 D_802A3838;
 // Pause
 extern s32 gPauseMenuHeldButtons;
 extern s32 gPauseMenuPressedButtons;
-extern s32 gPauseMenuCurrentDescString;
+extern s32 gPauseMenuCurrentDescMsg;
 extern s32* gPauseMenuCurrentDescIconScript;
 extern s32 D_802700D0;
 
@@ -182,7 +182,7 @@ extern char D_802700D[8];
 extern s32 D_802700E0;
 extern s32 gPauseMenuCommonIconIDs[8];
 extern s32 gPauseMenuTabIconIDs[6];
-extern s32 gPauseMenuStrings[348];
+extern s32 gPauseMenuMsgs[348];
 extern s32 gPauseMenuIconScripts[8];
 extern MenuPanel gPauseMenuPanels[7];
 extern s32 gPauseMenuCursorPosX;
diff --git a/src/181810.c b/src/181810.c
index f1ae42ff8d..9d6c7dc917 100644
--- a/src/181810.c
+++ b/src/181810.c
@@ -14,7 +14,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     Actor* actor;
     ActorPart* part;
-    s32 stringID;
+    s32 msgID;
     ActorID actorID;
     s32 partIndex;
     MessagePrintState** printContext;
@@ -22,15 +22,15 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) {
 
     f32 headX, headY, headZ;
     s32 screenX, screenY, screenZ;
-    s32 stringID2;
+    s32 msgID2;
 
     if (isInitialCall) {
-        stringID = evt_get_variable(script, *args++);
+        msgID = evt_get_variable(script, *args++);
         actorID = evt_get_variable(script, *args++);
         partIndex = evt_get_variable(script, *args++);
         gSpeakingActorTalkAnim = evt_get_variable(script, *args++);
         gSpeakingActorIdleAnim = evt_get_variable(script, *args++);
-        stringID2 = stringID;
+        msgID2 = msgID;
 
         if (actorID == ACTOR_SELF) {
             actorID = script->owner1.actorID;
@@ -54,7 +54,7 @@ ApiStatus ActorSpeak(Evt* script, s32 isInitialCall) {
         {
             s32* isPrintDone = &gSpeakingActorPrintIsDone;
             *isPrintDone = FALSE;
-            gSpeakingActorPrintCtx = msg_get_printer_for_string(stringID2, isPrintDone);
+            gSpeakingActorPrintCtx = msg_get_printer_for_msg(msgID2, isPrintDone);
         }
         msg_printer_set_origin_pos(gSpeakingActorPrintCtx, screenX, screenY);
 
@@ -114,10 +114,10 @@ ApiStatus ShowBattleChoice(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        s32 stringID = evt_get_variable(script, *args);
+        s32 msgID = evt_get_variable(script, *args);
 
         script->functionTemp[1] = 0;
-        D_8029FA64 = msg_get_printer_for_string(stringID, &script->functionTemp[1]);
+        D_8029FA64 = msg_get_printer_for_msg(msgID, &script->functionTemp[1]);
     }
 
     if (script->functionTemp[1] == 1) {
diff --git a/src/18C790.c b/src/18C790.c
index a3da975dd6..73e8fca40b 100644
--- a/src/18C790.c
+++ b/src/18C790.c
@@ -21,5 +21,5 @@ INCLUDE_ASM(s32, "18C790", btl_state_draw_celebration);
 INCLUDE_ASM(s32, "18C790", func_80260948);
 
 void func_80260A20(s64 posX, s32 posY) {
-    draw_string(0x1D00AB, posX + 11, posY + 6, 0xFF, 0xF, 0);
+    draw_msg(0x1D00AB, posX + 11, posY + 6, 0xFF, 0xF, 0);
 }
diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c
index 7b496e5e8d..838b00b495 100644
--- a/src/1a1f0_len_5390.c
+++ b/src/1a1f0_len_5390.c
@@ -369,28 +369,28 @@ void show_first_strike_message(void) {
             switch (currentEncounter->hitType) {
                 case 2:
                 case 4:
-                    width = get_string_width(0x1D00AC, 0) + 24;
+                    width = get_msg_width(0x1D00AC, 0) + 24;
                     posX = (xOffset + screenWidthHalf) - (width / 2);
                     draw_box(0, 0x14, posX, 69, 0, width, 28, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, 0, NULL,
                              SCREEN_WIDTH, SCREEN_HEIGHT, NULL);
-                    draw_string(0x1D00AC, posX + 11, 75, 0xFF, 0xA, 0);
+                    draw_msg(0x1D00AC, posX + 11, 75, 0xFF, 0xA, 0);
                     break;
                 case 6:
-                    width = get_string_width(0x1D00AD, 0) + 24;
+                    width = get_msg_width(0x1D00AD, 0) + 24;
                     posX = (xOffset + screenWidthHalf) - (width / 2);
                     draw_box(0, 0x14, posX, 69, 0, width, 28, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, 0, NULL,
                              SCREEN_WIDTH, SCREEN_HEIGHT, NULL);
-                    draw_string(0x1D00AD, posX + 11, 75, 0xFF, 0xA, 0);
+                    draw_msg(0x1D00AD, posX + 11, 75, 0xFF, 0xA, 0);
                     break;
             }
             break;
         case FIRST_STRIKE_ENEMY:
             if (!is_ability_active(ABILITY_CHILL_OUT)) {
-                width = get_string_width(0x1D00AE, 0) + 24;
+                width = get_msg_width(0x1D00AE, 0) + 24;
                 posX = (xOffset + screenWidthHalf) - (width / 2);
                 draw_box(0, 4, posX, 69, 0, width, 28, 255, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL, 0, NULL,
                          SCREEN_WIDTH, SCREEN_HEIGHT, NULL);
-                draw_string(0x1D00AE, posX + 11, 75, 0xFF, 0xA, 0);
+                draw_msg(0x1D00AE, posX + 11, 75, 0xFF, 0xA, 0);
             }
             break;
     }
diff --git a/src/325AD0.c b/src/325AD0.c
index b4d67f5cca..24b651d0f5 100644
--- a/src/325AD0.c
+++ b/src/325AD0.c
@@ -8,7 +8,7 @@ void* effectFuncs[] = {
     npc_raycast_down_sides, load_effect, sqrtf, mdl_draw_hidden_panel_surface, func_8011CFBC, guPerspectiveF,
     guMtxIdentF, transform_point, guLookAtHiliteF, set_screen_overlay_params_back, set_screen_overlay_center,
     set_screen_overlay_center_worldpos, mdl_get_next_texture_address, guPositionF, guOrthoF, guFrustumF, func_80138D88,
-    draw_box, draw_string, get_string_width, get_background_color_blend, sfx_play_sound_at_position
+    draw_box, draw_msg, get_msg_width, get_background_color_blend, sfx_play_sound_at_position
 };
 
 s32 D_E0200734[128] = {
diff --git a/src/415D90.c b/src/415D90.c
index 25c7656181..db0323d5e3 100644
--- a/src/415D90.c
+++ b/src/415D90.c
@@ -82,7 +82,7 @@ extern s32 D_802AD61C;
 extern s32 D_802AD620;
 extern s32 D_802AD624;
 extern s32 D_802AD628[];
-extern s32 D_802AD658[]; // string IDs
+extern s32 D_802AD658[]; // msg IDs
 extern s32 D_802AD66C;
 extern s8 D_802AD673;
 extern s32 D_802AD678[];
@@ -366,26 +366,26 @@ INCLUDE_ASM(s32, "415D90", func_802A2C84);
 INCLUDE_ASM(s32, "415D90", func_802A3C98);
 
 void func_802A43DC(s32 arg0, s32 x, s32 y) {
-    s32 stringID;
+    s32 msgID;
     s32 posX;
     s32 posY;
     s32 opacity;
     s32 palette;
 
     if (!battle_menu_hasSpiritsMenu) {
-        stringID = 0x1D0045;
+        msgID = 0x1D0045;
         posX = x + 16;
         posY = y + 2;
         opacity = battle_menu_moveTextOpacity;
         palette = 0x30;
     } else {
-        stringID = 0x1D003A;
+        msgID = 0x1D003A;
         posX = x + 6;
         posY = y + 2;
         opacity = battle_menu_moveTextOpacity;
         palette = 0x31;
     }
-    draw_string(stringID, posX, posY, opacity, palette, 1);
+    draw_msg(msgID, posX, posY, opacity, palette, 1);
 }
 
 void func_802A4448(s32 arg0, s32 x, s32 y) {
@@ -404,7 +404,7 @@ void func_802A4494(s32 arg0, s32 x, s32 y) {
         case 20:
         case 30:
             if (D_802AD10F != 0) {
-                draw_string(battle_menu_moveOptionDescriptions[battle_menu_moveOptionIndexMap[battle_menu_moveCursorPos]],
+                draw_msg(battle_menu_moveOptionDescriptions[battle_menu_moveOptionIndexMap[battle_menu_moveCursorPos]],
                             x + 8, y, battle_menu_moveTextOpacity, battle_menu_moveTextColor, 0);
             }
             break;
@@ -414,19 +414,19 @@ void func_802A4494(s32 arg0, s32 x, s32 y) {
 void func_802A4534(s32 arg0, s32 x, s32 y) {
     s32 posY = y;
     s32 posX;
-    s32 stringID;
+    s32 msgID;
 
     posY += 6;
     posX = x + 11;
 
     if (D_802AD258 != 0) {
-        stringID = 0x1D00C3;
+        msgID = 0x1D00C3;
     } else if (battle_menu_hasSpiritsMenu == FALSE) {
-        stringID = 0x1D009F;
+        msgID = 0x1D009F;
     } else {
-        stringID = 0x1D00A0;
+        msgID = 0x1D00A0;
     }
-    draw_string(stringID, posX, posY + D_802AB344[get_string_lines(stringID) - 1], 255, 0xF, 0);
+    draw_msg(msgID, posX, posY + D_802AB344[get_msg_lines(msgID) - 1], 255, 0xF, 0);
 }
 
 void func_802A45D8(void) {
@@ -592,7 +592,7 @@ void func_802A5290(s32 arg0, s32 x, s32 y) {
                 if (D_802AD690[i] == 0) {
                     palette = 0xB;
                 }
-                draw_string(D_802AD658[i], xTemp, phi_s1, D_802AD624, palette, 1);
+                draw_msg(D_802AD658[i], xTemp, phi_s1, D_802AD624, palette, 1);
             }
 
             xTemp = x + 24;
@@ -640,7 +640,7 @@ INCLUDE_ASM(s32, "415D90", func_802A5290);
 #endif
 
 void func_802A56F8(s32 arg0, s32 x, s32 y) {
-    draw_string(0x1D0043, x + 15, y + 2, D_802AD624, 0x33, 1);
+    draw_msg(0x1D0043, x + 15, y + 2, D_802AD624, 0x33, 1);
 }
 
 void func_802A5738(s32 arg0, s32 x, s32 y) {
@@ -651,7 +651,7 @@ void func_802A5738(s32 arg0, s32 x, s32 y) {
         case 20:
         case 30:
             if (D_802AD60B != 0) {
-                draw_string(D_802AD6C0[D_802AD605], x + 8, y, D_802AD624, D_802AD614, 0);
+                draw_msg(D_802AD6C0[D_802AD605], x + 8, y, D_802AD624, D_802AD614, 0);
             }
             break;
     }
@@ -664,9 +664,9 @@ void func_802A57C8(s32 arg0, s32 x, s32 y) {
     y += 6;
 
     if (D_802AD610 == 0) {
-        draw_string(0x1D00CB, x, y, 255, 15, 0);
+        draw_msg(0x1D00CB, x, y, 255, 15, 0);
     } else {
-        draw_string(0x1D00CC, x, y, 255, 15, 0);
+        draw_msg(0x1D00CC, x, y, 255, 15, 0);
     }
 }
 #else
diff --git a/src/encounter_api.c b/src/encounter_api.c
index 6757887274..8ce0088b95 100644
--- a/src/encounter_api.c
+++ b/src/encounter_api.c
@@ -552,12 +552,12 @@ ApiStatus func_80045900(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus SetTattleString(Evt* script, s32 isInitialCall) {
+ApiStatus SetTattleMsg(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     NpcID enemyId = evt_get_variable(script, *args++);
-    u32 tattleString = evt_get_variable(script, *args);
+    u32 tattleMsg = evt_get_variable(script, *args);
     Enemy* npc = get_enemy(enemyId);
 
-    npc->tattleString = tattleString;
+    npc->tattleMsg = tattleMsg;
     return ApiStatus_DONE2;
 }
diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c
index 8df9264d2d..b789f5d3f8 100644
--- a/src/entity/HeartBlock.c
+++ b/src/entity/HeartBlock.c
@@ -261,7 +261,7 @@ void entity_HeartBlock_show_tutorial_message(Entity* entity) {
     if ((!gPlayerData.partners[1].enabled) && get_global_flag(EVT_SAVE_FLAG(96)) == 0) {
         UNK_TYPE* ptr = &D_802EB3C0;
         *ptr = 0;
-        msg_get_printer_for_string(0x1D0001, ptr);
+        msg_get_printer_for_msg(0x1D0001, ptr);
         set_time_freeze_mode(TIME_FREEZE_PARTIAL);
         gOverrideFlags |= 0x40;
         disable_player_input();
diff --git a/src/entity/SaveBlock.c b/src/entity/SaveBlock.c
index e05134eb55..17687bcc8d 100644
--- a/src/entity/SaveBlock.c
+++ b/src/entity/SaveBlock.c
@@ -51,7 +51,7 @@ void entity_SaveBlock_save_data(void) {
 void entity_SaveBlock_show_tutorial_message(Entity* entity) {
     if (!get_global_flag(EVT_SAVE_FLAG(95))) {
         D_802EB390 = FALSE;
-        msg_get_printer_for_string(0x1D0000, &D_802EB390);
+        msg_get_printer_for_msg(0x1D0000, &D_802EB390);
         set_global_flag(EVT_SAVE_FLAG(95));
         return;
     }
@@ -69,12 +69,12 @@ void entity_SaveBlock_wait_for_close_tutorial(Entity* entity) {
 void entity_SaveBlock_show_choice_message(void) {
     D_802EB390 = FALSE;
     D_802EB394 = FALSE;
-    D_802EB39C = msg_get_printer_for_string(0x1D0004, &D_802EB394);
-    D_802EB398 = msg_get_printer_for_string(0x1E000A, &D_802EB390);
+    D_802EB39C = msg_get_printer_for_msg(0x1D0004, &D_802EB394);
+    D_802EB398 = msg_get_printer_for_msg(0x1E000A, &D_802EB390);
 }
 
 void entity_SaveBlock_show_result_message(void) {
-    msg_printer_load_string(0x1D0005, D_802EB39C);
+    msg_printer_load_msg(0x1D0005, D_802EB39C);
     sfx_play_sound(0x10);
 }
 
diff --git a/src/evt/msg_api.c b/src/evt/msg_api.c
index 21ca88edde..01a4c1023e 100644
--- a/src/evt/msg_api.c
+++ b/src/evt/msg_api.c
@@ -24,13 +24,13 @@ ApiStatus ShowMessageAtScreenPos(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        s32 stringID = evt_get_variable(script, *args++);
+        s32 msgID = evt_get_variable(script, *args++);
         s32 x = evt_get_variable(script, *args++);
         s32 y = evt_get_variable(script, *args++);
         s32* temp802DB264 = &D_802DB264;
 
         *temp802DB264 = 0;
-        gCurrentPrintContext = msg_get_printer_for_string(stringID, temp802DB264);
+        gCurrentPrintContext = msg_get_printer_for_msg(msgID, temp802DB264);
         msg_printer_set_origin_pos(gCurrentPrintContext, x, y);
     }
 
@@ -52,7 +52,7 @@ ApiStatus ShowMessageAtWorldPos(Evt* script, s32 isInitialCall) {
     s32* currentCameraID = &gCurrentCameraID;
 
     if (isInitialCall) {
-        s32 stringID = evt_get_variable(script, *args++);
+        s32 msgID = evt_get_variable(script, *args++);
         s32 x = evt_get_variable(script, *args++);
         s32 y = evt_get_variable(script, *args++);
         s32 z = evt_get_variable(script, *args++);
@@ -63,7 +63,7 @@ ApiStatus ShowMessageAtWorldPos(Evt* script, s32 isInitialCall) {
 
         *temp802DB264 = 0;
         currentPrintContext = &gCurrentPrintContext;
-        *currentPrintContext = msg_get_printer_for_string(stringID, temp802DB264);
+        *currentPrintContext = msg_get_printer_for_msg(msgID, temp802DB264);
         get_screen_coords(*currentCameraID, x, y, z, &x2, &y2, &z2);
         msg_printer_set_origin_pos(*currentPrintContext, x2, y2);
     }
@@ -99,7 +99,7 @@ ApiStatus SwitchMessage(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
 
     if (isInitialCall) {
-        msg_printer_load_string(evt_get_variable(script, *args), gCurrentPrintContext);
+        msg_printer_load_msg(evt_get_variable(script, *args), gCurrentPrintContext);
     }
 
     if (gCurrentPrintContext->stateFlags & 0x40) {
@@ -117,10 +117,10 @@ ApiStatus ShowChoice(Evt* script, s32 isInitialCall) {
     MessagePrintState** temp802DB268;
 
     if (isInitialCall) {
-        s32 stringID = evt_get_variable(script, *args++);
+        s32 msgID = evt_get_variable(script, *args++);
 
         script->functionTemp[1] = 0;
-        D_802DB268 = msg_get_printer_for_string(stringID, &script->functionTemp[1]);
+        D_802DB268 = msg_get_printer_for_msg(msgID, &script->functionTemp[1]);
     }
 
     temp802DB268 = &D_802DB268;
@@ -163,12 +163,12 @@ ApiStatus func_802D0C94(Evt* script, s32 initialCall) {
     return ApiStatus_DONE2;
 }
 
-ApiStatus SetMessageString(Evt* script, s32 isInitialCall) {
+ApiStatus SetMessageMsg(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
-    s32 string = evt_get_variable(script, *args++);
+    s32 msg = evt_get_variable(script, *args++);
     s32 index = evt_get_variable(script, *args++);
 
-    set_message_string(string, index);
+    set_message_msg(msg, index);
     return ApiStatus_DONE2;
 }
 
diff --git a/src/msg.c b/src/msg.c
index 7255973531..11d9b1c3f2 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -104,7 +104,7 @@ extern s32 gMsgVarImages; // message images?
 extern s32 gMsgBGScrollAmtY;
 extern s32 D_80151338;
 extern char gMessageBuffers[][1024];
-extern u8 gMessageStringVars[3][32];
+extern u8 gMessageMsgVars[3][32];
 extern s16 D_80155C98;
 extern Matrix4s gMessageWindowProjMatrix[2];
 extern MessageDrawState* gMessageDrawStatePtr;
@@ -122,7 +122,7 @@ void load_font(s32 font);
 s32 _update_message(MessagePrintState*);
 void appendGfx_message(MessagePrintState*, s16, s16, u16, u16, u16, u8);
 void appendGfx_msg_prim_rect(u8 r, u8 g, u8 b, u8 a, u16 ulX, u16 ulY, u16 lrX, u16 lrY);
-void get_string_properties(s32 stringID, s32* height, s32* width, s32* maxLineChars, s32* numLines,
+void get_msg_properties(s32 msgID, s32* height, s32* width, s32* maxLineChars, s32* numLines,
                            s32* maxLinesPerPage, s32* arg6, s32 charset);
 
 
@@ -140,8 +140,8 @@ void clear_printers(void) {
     gMsgBGScrollAmtX = 0;
     gMsgBGScrollAmtY = 0;
 
-    for (i = 0; i < ARRAY_COUNT(gMessageStringVars); i++) {
-        gMessageStringVars[i][0] = 0;
+    for (i = 0; i < ARRAY_COUNT(gMessageMsgVars); i++) {
+        gMessageMsgVars[i][0] = 0;
     }
 
     D_80151338 = 0;
@@ -612,7 +612,7 @@ void initialize_printer(MessagePrintState* printer, s32 arg1, s32 arg2) {
     printer->charsPerChunk = 1;
     printer->unk_464 = 6;
     printer->srcBuffer = NULL;
-    printer->stringID = 0;
+    printer->msgID = 0;
     printer->currentPrintDelay = 0;
     printer->windowOffsetPos.x = 0;
     printer->windowOffsetPos.y = 0;
@@ -678,7 +678,7 @@ void initialize_printer(MessagePrintState* printer, s32 arg1, s32 arg2) {
     printer->sizeScale = 1.0f;
 }
 
-void dma_load_string(u32 msgID, void* dest) {
+void dma_load_msg(u32 msgID, void* dest) {
     u8* addr = (u8*) MSG_ROM_START + (msgID >> 14); // (msgID >> 16) * 4
     u8* offset[2]; // start, end
 
@@ -691,10 +691,10 @@ void dma_load_string(u32 msgID, void* dest) {
     dma_copy(MSG_ROM_START + offset[0], MSG_ROM_START + offset[1], dest);
 }
 
-s32* load_message_to_buffer(s32 stringID) {
+s32* load_message_to_buffer(s32 msgID) {
     s32* prevBufferPos;
 
-    dma_load_string(stringID, &gMessageBuffers[gNextMessageBuffer]);
+    dma_load_msg(msgID, &gMessageBuffers[gNextMessageBuffer]);
     prevBufferPos = gMessageBuffers[gNextMessageBuffer];
 
     gNextMessageBuffer++;
@@ -705,17 +705,17 @@ s32* load_message_to_buffer(s32 stringID) {
     return prevBufferPos;
 }
 
-MessagePrintState* msg_get_printer_for_string(s32 stringID, s32* donePrintingWriteback) {
-    return _msg_get_printer_for_string(stringID, donePrintingWriteback, 0);
+MessagePrintState* msg_get_printer_for_msg(s32 msgID, s32* donePrintingWriteback) {
+    return _msg_get_printer_for_msg(msgID, donePrintingWriteback, 0);
 }
 
 #ifdef NON_MATCHING
-MessagePrintState* _msg_get_printer_for_string(s32 stringID, s32* donePrintingWriteback, s32 arg2) {
-    if (stringID != 0) {
-        s8* srcBuffer = (s8*) stringID;
+MessagePrintState* _msg_get_printer_for_msg(s32 msgID, s32* donePrintingWriteback, s32 arg2) {
+    if (msgID != 0) {
+        s8* srcBuffer = (s8*) msgID;
         s32 i;
 
-        if (stringID >= 0) {
+        if (msgID >= 0) {
             srcBuffer = load_message_to_buffer(srcBuffer);
         }
 
@@ -732,11 +732,11 @@ MessagePrintState* _msg_get_printer_for_string(s32 stringID, s32* donePrintingWr
                 initialize_printer(printer, 1, arg2);
                 printer->windowState = 1;
                 printer->srcBuffer = srcBuffer;
-                printer->stringID = stringID;
+                printer->msgID = msgID;
                 printer->stateFlags |= 2;
-                get_string_properties(stringID, &height, &width, &maxLineChars, &numLines, &maxLinesPerPage, NULL, 0);
-                printer->stringHeight = height;
-                printer->stringWidth = width;
+                get_msg_properties(msgID, &height, &width, &maxLineChars, &numLines, &maxLinesPerPage, NULL, 0);
+                printer->msgHeight = height;
+                printer->msgWidth = width;
                 printer->maxLineChars = maxLineChars;
                 printer->numLines = numLines;
                 printer->maxLinesPerPage = maxLinesPerPage;
@@ -752,16 +752,16 @@ MessagePrintState* _msg_get_printer_for_string(s32 stringID, s32* donePrintingWr
     return NULL;
 }
 #else
-INCLUDE_ASM(MessagePrintState*, "msg", _msg_get_printer_for_string, s32 stringID, s32* donePrintingWriteback, s32 arg2);
+INCLUDE_ASM(MessagePrintState*, "msg", _msg_get_printer_for_msg, s32 msgID, s32* donePrintingWriteback, s32 arg2);
 #endif
 
-s32 msg_printer_load_string(s32 stringID, MessagePrintState* printer) {
+s32 msg_printer_load_msg(s32 msgID, MessagePrintState* printer) {
     s32* buffer;
 
-    if (stringID >= 0) {
-        buffer = load_message_to_buffer(stringID);
+    if (msgID >= 0) {
+        buffer = load_message_to_buffer(msgID);
     } else {
-        buffer = (s32*) stringID;
+        buffer = (s32*) msgID;
     }
 
     printer->srcBuffer = buffer;
@@ -803,21 +803,21 @@ void set_message_images(s32* images) {
 
 // loop crap
 #ifdef NON_MATCHING
-void set_message_string(s32 stringID, s32 index) {
-    u8* buffer = stringID;
+void set_message_msg(s32 msgID, s32 index) {
+    u8* buffer = msgID;
     u8* mallocSpace = NULL;
     u8* it;
     s32 i;
     s32 new_var;
 
-    if (stringID >= 0) {
+    if (msgID >= 0) {
         buffer = general_heap_malloc(0x400);
-        dma_load_string(stringID, buffer);
+        dma_load_msg(msgID, buffer);
         mallocSpace = buffer;
     }
 
-    for (i = 0; i < ARRAY_COUNT(gMessageStringVars[index]); i++) {
-        gMessageStringVars[index][i] = buffer[i];
+    for (i = 0; i < ARRAY_COUNT(gMessageMsgVars[index]); i++) {
+        gMessageMsgVars[index][i] = buffer[i];
         if (buffer[i] == 0xFD) {
             break;
         }
@@ -828,25 +828,25 @@ void set_message_string(s32 stringID, s32 index) {
     }
 }
 #else
-INCLUDE_ASM(s32, "msg", set_message_string);
+INCLUDE_ASM(s32, "msg", set_message_msg);
 #endif
 
 void set_message_value(s32 value, s32 index) {
-    s8 strBuffer[ARRAY_COUNT(gMessageStringVars[index])];
+    s8 strBuffer[ARRAY_COUNT(gMessageMsgVars[index])];
     s8* bufferIt;
     s32 i;
 
     int_to_string(value, &strBuffer, 10);
 
-    for (i = 0, bufferIt = strBuffer; i < ARRAY_COUNT(gMessageStringVars[index]) - 1; i++) {
+    for (i = 0, bufferIt = strBuffer; i < ARRAY_COUNT(gMessageMsgVars[index]) - 1; i++) {
         s8 thisChar = bufferIt[i];
 
         if (thisChar == 0) {
             break;
         }
-        gMessageStringVars[index][i] = thisChar - 0x20;
+        gMessageMsgVars[index][i] = thisChar - 0x20;
     }
-    gMessageStringVars[index][i] = 0xFD;
+    gMessageMsgVars[index][i] = 0xFD;
 }
 
 void close_message(MessagePrintState* msgPrintState) {
@@ -854,9 +854,9 @@ void close_message(MessagePrintState* msgPrintState) {
 }
 
 // so close, just some dumb control flow thing at the beginning
-s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 stringScale, s32 overrideCharWidth, u8 flags);
+s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags);
 #ifdef NON_MATCHING
-s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 stringScale, s32 overrideCharWidth, u8 flags) {
+s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags) {
     u8* charWidthTable;
     f32 baseWidth;
     f64 charWidth;
@@ -873,52 +873,52 @@ s32 msg_get_print_char_width(s32 character, s32 charset, s32 variation, f32 stri
         }
 
         if (character == 0xF7) {
-            charWidth = baseWidth * stringScale;
+            charWidth = baseWidth * msgScale;
             modifier = 0.6;
             return charWidth * modifier;
         }
         if (character == 0xF8) {
-            charWidth = baseWidth * stringScale;
+            charWidth = baseWidth * msgScale;
             return charWidth;
         }
         if (character == 0xF9) {
-            charWidth = baseWidth * stringScale;
+            charWidth = baseWidth * msgScale;
             modifier = 0.5;
             return charWidth * modifier;
         }
         if (character < 0xF0) {
-            return baseWidth * stringScale;
+            return baseWidth * msgScale;
         }
     }
     return 0;
 }
 #else
-INCLUDE_ASM(s32, "msg", msg_get_print_char_width, s32 character, s32 charset, s32 variation, f32 stringScale, s32 overrideCharWidth, u8 flags);
+INCLUDE_ASM(s32, "msg", msg_get_print_char_width, s32 character, s32 charset, s32 variation, f32 msgScale, s32 overrideCharWidth, u8 flags);
 #endif
 
-s32 msg_get_draw_char_width(s32 character, s32 charset, s32 varaition, f32 stringScale, s32 overrideCharWidth, s32 flags);
-INCLUDE_ASM(s32, "msg", msg_get_draw_char_width, s32 character, s32 charset, s32 varaition, f32 stringScale, s32 overrideCharWidth, s32 flags);
+s32 msg_get_draw_char_width(s32 character, s32 charset, s32 varaition, f32 msgScale, s32 overrideCharWidth, s32 flags);
+INCLUDE_ASM(s32, "msg", msg_get_draw_char_width, s32 character, s32 charset, s32 varaition, f32 msgScale, s32 overrideCharWidth, s32 flags);
 
-INCLUDE_ASM(void, "msg", get_string_properties, s32 stringID, s32* height, s32* width, s32* maxLineChars, s32* numLines,
+INCLUDE_ASM(void, "msg", get_msg_properties, s32 msgID, s32* height, s32* width, s32* maxLineChars, s32* numLines,
             s32* maxLinesPerPage, s32* arg6, s32 charset);
 
-s32 get_string_width(s32 stringID, u16 charset) {
+s32 get_msg_width(s32 msgID, u16 charset) {
     s32 width;
 
-    get_string_properties(stringID, NULL, &width, NULL, NULL, NULL, NULL, charset);
+    get_msg_properties(msgID, NULL, &width, NULL, NULL, NULL, NULL, charset);
     return width;
 }
 
-s32 get_string_lines(s32 stringID) {
+s32 get_msg_lines(s32 msgID) {
     s32 numLines;
 
-    get_string_properties(stringID, NULL, NULL, NULL, &numLines, NULL, NULL, 0);
+    get_msg_properties(msgID, NULL, NULL, NULL, &numLines, NULL, NULL, 0);
     return numLines;
 }
 
-// some weird stacky stringIDy stuff
+// some weird stacky msgIDy stuff
 #ifdef NON_MATCHING
-void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style) {
+void draw_msg(s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, u8 style) {
     s32 width;
     MessagePrintState stackPrinter;
     MessagePrintState* printer;
@@ -932,7 +932,7 @@ void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, u8
     mallocSpace = NULL;
     charset = 0;
 
-    if (stringID != 0) {
+    if (msgID != 0) {
         if (style & 1) {
             flags = 2;
             charset = 1;
@@ -945,14 +945,14 @@ void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, u8
         printer = &stackPrinter;
         initialize_printer(printer, 1, 0);
 
-        if (stringID < 0) {
-            printer = (MessagePrintState*)stringID;
+        if (msgID < 0) {
+            printer = (MessagePrintState*)msgID;
         } else {
             mallocSpace = general_heap_malloc(0x400);
-            dma_load_string(stringID, mallocSpace);
+            dma_load_msg(msgID, mallocSpace);
             printer->srcBuffer = mallocSpace;
-            get_string_properties(stringID, 0, &width, 0, 0, 0, 0, charset);
-            printer->stringWidth = width;
+            get_msg_properties(msgID, 0, &width, 0, 0, 0, 0, charset);
+            printer->msgWidth = width;
         }
 
         if (palette >= 0) {
@@ -992,7 +992,7 @@ void draw_string(s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, u8
     }
 }
 #else
-INCLUDE_ASM(void, "msg", draw_string, s32 stringID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style);
+INCLUDE_ASM(void, "msg", draw_msg, s32 msgID, s32 posX, s32 posY, s32 opacity, s32 palette, s32 style);
 #endif
 
 INCLUDE_ASM(s32, "msg", msg_update_rewind_arrow);
diff --git a/src/pause/135EE0.c b/src/pause/135EE0.c
index 187a291240..ad5b259ef5 100644
--- a/src/pause/135EE0.c
+++ b/src/pause/135EE0.c
@@ -2,7 +2,7 @@
 
 BSS s32 gPauseMenuHeldButtons;
 BSS s32 gPauseMenuPressedButtons;
-BSS s32 gPauseMenuCurrentDescString;
+BSS s32 gPauseMenuCurrentDescMsg;
 BSS s32* gPauseMenuCurrentDescIconScript;
 BSS s32 D_802700D0;
 BSS s8 gPauseMenuCurrentTab;
diff --git a/src/pause/1421C0.c b/src/pause/1421C0.c
index 3ad0d86cda..6a10e9b86e 100644
--- a/src/pause/1421C0.c
+++ b/src/pause/1421C0.c
@@ -4,11 +4,11 @@ extern s32 D_8026F8D4[];
 
 // Needs .data section
 #ifdef NON_MATCHING
-s32 pause_get_menu_string(s32 index) {
-    return gPauseMenuStrings[index];
+s32 pause_get_menu_msg(s32 index) {
+    return gPauseMenuMsgs[index];
 }
 #else
-INCLUDE_ASM(s32, "pause/1421C0", pause_get_menu_string);
+INCLUDE_ASM(s32, "pause/1421C0", pause_get_menu_msg);
 #endif
 
 void pause_draw_menu_label(s32 index, s32 x, s32 y) {
diff --git a/src/pause/pause_map.c b/src/pause/pause_map.c
index 9613539da9..f872695a72 100644
--- a/src/pause/pause_map.c
+++ b/src/pause/pause_map.c
@@ -50,9 +50,9 @@ void pause_map_draw_title(s32* arg1, s32 arg2, s32 textOffsetY, s32 textOffsetX)
 
     if (gPauseMenuCurrentTab == 6) {
         if (pause_map_cursorCurrentOption != -1) {
-            msgWidth = get_string_width(MSG_pause_map_location_0_name + (pause_map_cursorCurrentOption * 3), 0);
+            msgWidth = get_msg_width(MSG_pause_map_location_0_name + (pause_map_cursorCurrentOption * 3), 0);
             msgID = MSG_pause_map_location_0_name + (pause_map_cursorCurrentOption * 3);
-            draw_string(msgID, arg2 + ((textOffsetX - msgWidth) >> 1), textOffsetY + 1, 255, 0, 0);
+            draw_msg(msgID, arg2 + ((textOffsetX - msgWidth) >> 1), textOffsetY + 1, 255, 0, 0);
         }
     }
 }
@@ -194,15 +194,15 @@ void pause_map_handle_input(void) {
 
     gPauseMenuCurrentDescIconScript = 0;
     if (pause_map_cursorCurrentOption == -1) {
-        gPauseMenuCurrentDescString = 0;
+        gPauseMenuCurrentDescMsg = 0;
         return;
     }
 
-    gPauseMenuCurrentDescString = MSG_pause_map_location_0_before_desc + (pause_map_cursorCurrentOption * 3);
+    gPauseMenuCurrentDescMsg = MSG_pause_map_location_0_before_desc + (pause_map_cursorCurrentOption * 3);
 
     // If the story has progressed enough, show the "after" description
     if (evt_get_variable(0, EVT_STORY_PROGRESS) >= pause_map_spaces[pause_map_cursorCurrentOption].afterRequirement) {
-        gPauseMenuCurrentDescString++;
+        gPauseMenuCurrentDescMsg++;
     }
 }
 
diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c
index 1be3b519df..56412c4524 100644
--- a/src/world/area_dro/dro_01/95B7E0.c
+++ b/src/world/area_dro/dro_01/95B7E0.c
@@ -1103,9 +1103,9 @@ EvtSource N(802468F8) = SCRIPT({
             N(func_80241F60_95D160)();
             SetMessageValue(EVT_SAVE_VAR(352), 0);
             if (EVT_SAVE_VAR(352) == 1) {
-                SetMessageString(2148844180, 1);
+                SetMessageMsg(2148844180, 1);
             } else {
-                SetMessageString(2148844176, 1);
+                SetMessageMsg(2148844176, 1);
             }
             SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000F));
         }
diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c
index ccfa3636cd..c707e64011 100644
--- a/src/world/area_dro/dro_02/9694C0.c
+++ b/src/world/area_dro/dro_02/9694C0.c
@@ -1001,9 +1001,9 @@ EvtSource N(80246520) = SCRIPT({
             N(func_80240DF0_969FB0)();
             SetMessageValue(EVT_SAVE_VAR(352), 0);
             if (EVT_SAVE_VAR(352) == 1) {
-                SetMessageString(2148844180, 1);
+                SetMessageMsg(2148844180, 1);
             } else {
-                SetMessageString(2148844176, 1);
+                SetMessageMsg(2148844176, 1);
             }
             SpeakToPlayer(NPC_SELF, NPC_ANIM_chuck_quizmo_Palette_00_Anim_4, NPC_ANIM_chuck_quizmo_Palette_00_Anim_1, 0, MESSAGE_ID(0x08, 0x000F));
         }
diff --git a/src/world/common/DeadGetItemName.inc.c b/src/world/common/DeadGetItemName.inc.c
index 866c5ac14a..263f884a04 100644
--- a/src/world/common/DeadGetItemName.inc.c
+++ b/src/world/common/DeadGetItemName.inc.c
@@ -5,6 +5,6 @@ ApiStatus N(DeadGetItemName)(Evt* script, s32 isInitialCall) {
     Bytecode args = *script->ptrReadPos;
     s32 itemID = evt_get_variable(script, args);
 
-    evt_set_variable(script, args, LOOKUP_ITEM(itemID).nameString);
+    evt_set_variable(script, args, LOOKUP_ITEM(itemID).nameMsg);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/GetItemName.inc.c b/src/world/common/GetItemName.inc.c
index 0d78eaca43..2588148065 100644
--- a/src/world/common/GetItemName.inc.c
+++ b/src/world/common/GetItemName.inc.c
@@ -5,6 +5,6 @@ ApiStatus N(GetItemName)(Evt* script, s32 isInitialCall) {
     Bytecode a0 = *script->ptrReadPos;
     s32 itemID = evt_get_variable(script, a0);
 
-    evt_set_variable(script, a0, LOOKUP_ITEM(itemID).nameString);
+    evt_set_variable(script, a0, LOOKUP_ITEM(itemID).nameMsg);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/common/UnkFunc19.inc.c b/src/world/common/UnkFunc19.inc.c
index bc86a45043..c22101de1d 100644
--- a/src/world/common/UnkFunc19.inc.c
+++ b/src/world/common/UnkFunc19.inc.c
@@ -4,7 +4,7 @@
 extern s32 D_8008EF20[11][4];
 
 ApiStatus N(UnkFunc19)(Evt* script, s32 isInitialCall) {
-    set_message_string(D_8008EF20[gPlayerData.currentPartner][0], 0);
+    set_message_msg(D_8008EF20[gPlayerData.currentPartner][0], 0);
 
     return ApiStatus_DONE2;
 }
diff --git a/src/world/script_api/7E0E80.c b/src/world/script_api/7E0E80.c
index 566ba535d0..e1b60cc86a 100644
--- a/src/world/script_api/7E0E80.c
+++ b/src/world/script_api/7E0E80.c
@@ -26,10 +26,10 @@ s32 BadgeShopInteract[] = { 0x00000043, 0x00000002, ShowShopPurchaseDialog, 0xFE
 
 s32 shop_owner_begin_speech(s32 messageIndex) {
     Shop* shop = gGameStatusPtr->mapShop;
-    s32 shopStringID = shop->owner->shopStringIDs[messageIndex];
+    s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex];
     Evt* script = start_script(&ShopBeginSpeech, 1, 0);
 
-    script->varTable[0] = shopStringID;
+    script->varTable[0] = shopMsgID;
     script->varTable[1] = shop->owner->npcID;
     script->varTable[2] = shop->owner->talkAnim;
     script->varTable[3] = shop->owner->idleAnim;
@@ -39,11 +39,11 @@ s32 shop_owner_begin_speech(s32 messageIndex) {
 
 s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCost) {
     Shop* shop = gGameStatusPtr->mapShop;
-    s32 shopStringID = shop->owner->shopStringIDs[messageIndex];
+    s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex];
     Evt* script;
     s32 phi_a0;
 
-    set_message_string(itemName, 0);
+    set_message_msg(itemName, 0);
     set_message_value(coinCost, 1);
 
     if (bpCost > 0) {
@@ -54,11 +54,11 @@ s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCo
         } else {
             phi_a0 = &MessagePlural;
         }
-        set_message_string(phi_a0, 2);
+        set_message_msg(phi_a0, 2);
     }
 
     script = start_script(&ShopBeginSpeech, 1, 0);
-    script->varTable[0] = shopStringID;
+    script->varTable[0] = shopMsgID;
     script->varTable[1] = shop->owner->npcID;
     script->varTable[2] = shop->owner->talkAnim;
     script->varTable[3] = shop->owner->idleAnim;
@@ -68,10 +68,10 @@ s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCo
 
 s32 shop_owner_continue_speech(s32 messageIndex) {
     Shop* shop = gGameStatusPtr->mapShop;
-    s32 shopStringID = shop->owner->shopStringIDs[messageIndex];
+    s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex];
     Evt* script = start_script(&ShopContinueSpeech, 1, 0);
 
-    script->varTable[0] = shopStringID;
+    script->varTable[0] = shopMsgID;
     script->varTable[1] = shop->owner->npcID;
     script->varTable[2] = shop->owner->talkAnim;
     script->functionTemp[3] = script->varTable[3] = shop->owner->idleAnim;
@@ -81,7 +81,7 @@ s32 shop_owner_continue_speech(s32 messageIndex) {
 
 s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) {
     Shop* shop = gGameStatusPtr->mapShop;
-    s32 shopStringID = shop->owner->shopStringIDs[messageIndex];
+    s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex];
     s32 phi_a0;
     Evt* script;
 
@@ -93,10 +93,10 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) {
         phi_a0 = &MessagePlural;
     }
 
-    set_message_string(phi_a0, 1);
+    set_message_msg(phi_a0, 1);
 
     script = start_script(&ShopContinueSpeech, 1, 0);
-    script->varTable[0] = shopStringID;
+    script->varTable[0] = shopMsgID;
     script->varTable[1] = shop->owner->npcID;
     script->varTable[2] = shop->owner->talkAnim;
     script->functionTemp[3] = script->varTable[3] = shop->owner->idleAnim;
@@ -106,10 +106,10 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) {
 
 s32 shop_owner_reset_speech(s32 messageIndex) {
     Shop* shop = gGameStatusPtr->mapShop;
-    s32 shopStringID = shop->owner->shopStringIDs[messageIndex];
+    s32 shopMsgID = shop->owner->shopMsgIDs[messageIndex];
     Evt* script = start_script(&ShopResetSpeech, 1, 0);
 
-    script->varTable[0] = shopStringID;
+    script->varTable[0] = shopMsgID;
     script->varTable[1] = shop->owner->npcID;
     script->varTable[2] = shop->owner->talkAnim;
     script->functionTemp[3] = script->varTable[3] = shop->owner->idleAnim;
@@ -228,8 +228,8 @@ void shop_open_item_select_popup(s32 mode) {
             menu->ptrIcon[i] = D_8008A680[gItemTable[itemID].iconID][0];
             menu->userIndex[i] = i;
             menu->enabled[i] = TRUE;
-            menu->nameString[i] = gItemTable[itemID].nameString;
-            menu->descString[i] = gItemTable[itemID].itemString;
+            menu->nameMsg[i] = gItemTable[itemID].nameMsg;
+            menu->descMsg[i] = gItemTable[itemID].itemMsg;
             menu->value[i] = shop_get_sell_price(itemID);
             numEntries++;
         }
@@ -301,14 +301,14 @@ void shop_draw_item_name(s32 arg0, s32 posX, s32 posY) {
     StaticInventoryItem* siItem = &shop->staticInventory[shop->currentItemSlot];
     StaticItem* item = &gItemTable[siItem->unk_00];
 
-    draw_string(item->nameString, posX + 60 - (get_string_width(item->nameString, 0) >> 1), posY + 6, 255, 0, 0);
+    draw_msg(item->nameMsg, posX + 60 - (get_msg_width(item->nameMsg, 0) >> 1), posY + 6, 255, 0, 0);
 }
 
 void shop_draw_item_desc(s32 arg0, s32 posX, s32 posY) {
     Shop* shop = gGameStatusPtr->mapShop;
     StaticInventoryItem* item = &shop->staticInventory[shop->currentItemSlot];
 
-    draw_string(item->unk_08, posX + 8, posY, 255, 0xA, 0);
+    draw_msg(item->unk_08, posX + 8, posY, 255, 0xA, 0);
 }
 
 // Problems with the struct iteration
diff --git a/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s b/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
index d764270679..b0efbcdc03 100644
--- a/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
+++ b/ver/us/asm/data/world/area_hos/hos_03/A23120.data.s
@@ -51,7 +51,7 @@ glabel D_802496AC_A247AC
 .word 0x00000045, 0x00000002, D_802494E0_A245E0, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80249520_A24620, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024975C_A2485C
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, hos_03_Set80151310_1, 0x00000043, 0x00000001, hos_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802481C0_A232C0, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802488E8_A239E8, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242C14_A1DD14, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_8024895C_A23A5C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80243508_A1E608, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242B90_A1DC90, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242FAC_A1E0AC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802495FC_A246FC, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802496AC_A247AC, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242FC8_A1E0C8, 0x00000043, 0x00000001, func_80242E2C_A1DF2C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000044, 0x00000001, D_80248458_A23558, 0x00000043, 0x00000001, hos_03_UnkFunc29, 0x00000043, 0x00000001, hos_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, hos_03_Set80151310_1, 0x00000043, 0x00000001, hos_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802481C0_A232C0, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802488E8_A239E8, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242C14_A1DD14, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_8024895C_A23A5C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80243508_A1E608, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242B90_A1DC90, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242FAC_A1E0AC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, hos_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802495FC_A246FC, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248020_A23120, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242EE0_A1DFE0, 0x0000000F, 0x00000043, 0x00000001, func_80242F94_A1E094, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802496AC_A247AC, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242F14_A1E014, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242FC8_A1E0C8, 0x00000043, 0x00000001, func_80242E2C_A1DF2C, 0x00000046, 0x00000001, D_80248110_A23210, 0x00000044, 0x00000001, D_80248458_A23558, 0x00000043, 0x00000001, hos_03_UnkFunc29, 0x00000043, 0x00000001, hos_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A48C_A2558C
 .word 0x00000043, 0x00000001, func_802425E0_A1D6E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, hos_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s b/ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s
index a839d06bd4..f52fa2d8ab 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
@@ -51,7 +51,7 @@ glabel D_802435EC_A3CACC
 .word 0x000000F3, 0x00000001, 0x0024008D, 0x000000FC, 0x00000001, 0x00240096, 0x000000FE, 0x00000003, 0x00240098, 0x000000F1, 0x00000005, 0x00240081, 0x000000F2, 0x00000005, 0x0024008C, 0x000000FF, 0x00000008, 0x00240079, 0x00000140, 0x00000008, 0x0024007A, 0x00000144, 0x0000000A, 0x0024009F, 0x00000100, 0x0000000A, 0x00240099, 0x0000011A, 0x0000000C, 0x0024007C, 0x0000011B, 0x0000000C, 0x0024007D, 0x000000F5, 0x0000000F, 0x00240078, 0x000000FD, 0x00000014, 0x0024009A, 0x00000105, 0x00000019, 0x0024007B, 0x000000E2, 0x00000019, 0x00240073
 
 glabel D_802436A0_A3CB80
-.word 0x00000046, 0x00000001, D_8024351C_A3C9FC, 0x00000046, 0x00000001, D_8024356C_A3CA4C, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE02E1, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004D, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF840626A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004A, 0x00000024, 0x00000002, 0xF840626A, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004B, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0014, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240A68_A39F48, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004F, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0050, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240AD0_A39FB0, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0051, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240A68_A39F48, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0051, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetMessageString, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0053, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0052, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0054, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000029, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, AddStarPieces, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E1, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000043, 0x00000002, func_80240A94_A39F74, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_80242C0C_A3C0EC, 0x00000043, 0x00000003, AddBadge, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x00000002, 0xF5DE02E1, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240A68_A39F48, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0056, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0057, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000046, 0x00000001, D_8024351C_A3C9FC, 0x00000046, 0x00000001, D_8024356C_A3CA4C, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE02E1, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004D, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF840626A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004A, 0x00000024, 0x00000002, 0xF840626A, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004B, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0014, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240A68_A39F48, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A004F, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0050, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240AD0_A39FB0, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0051, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240A68_A39F48, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0051, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0053, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0052, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0054, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000029, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, AddStarPieces, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E1, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000043, 0x00000002, func_80240A94_A39F74, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_80242C0C_A3C0EC, 0x00000043, 0x00000003, AddBadge, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x00000002, 0xF5DE02E1, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240A68_A39F48, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0055, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0056, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00B20004, 0x00B20001, 0x00000000, 0x000A0057, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80243C04_A3D0E4
 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802435D0_A3CAB0, 0x00000044, 0x00000001, 0x80245604, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_isk/isk_11/98B620.data.s b/ver/us/asm/data/world/area_isk/isk_11/98B620.data.s
index 63f2e4c0f5..d9a0522184 100644
--- a/ver/us/asm/data/world/area_isk/isk_11/98B620.data.s
+++ b/ver/us/asm/data/world/area_isk/isk_11/98B620.data.s
@@ -9,16 +9,16 @@ glabel D_80241920_98C330
 .word 0x00000015, 0x00000016, 0x00000017, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x0000004E, 0x00000006, D_80241BC4_98C5D4, 0x00000100, 0x00000024, D_80241920_98C330, 0x00000000, 0x00000001, 0x0000004E, 0x00000006, D_80241E8C_98C89C, 0x00000100, 0x00000022, D_80241920_98C330, 0x00000000, 0x00000001, 0x0000004E, 0x00000006, D_80242154_98CB64, 0x00000100, 0x0000002A, D_80241920_98C330, 0x00000000, 0x00000001, 0x0000004E, 0x00000006, D_8024241C_98CE2C, 0x00000100, 0x00000028, D_80241920_98C330, 0x00000000, 0x00000001, 0x0000004E, 0x00000006, D_802426E4_98D0F4, 0x00000100, 0x00000026, D_80241920_98C330, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8E, 0xFFFFFFFF, 0x0000000B, 0x00000002, 0xF5DE021C, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021C, 0xFFFFFFA8, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE021D, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021D, 0xFFFFFFD4, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE021E, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021E, 0x00000000, 0xFFFFFE04, 0x000001FE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE021F, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021F, 0x0000002C, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0220, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE0220, 0x00000058, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241BC4_98C5D4
-.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021C, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000024, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021C, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021C, 0x00000024, 0x00000002, 0xF5DE021C, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8A, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021C, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021C, 0xFFFFFFA8, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000024, 0x00000261, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021C, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000024, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021C, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021C, 0x00000024, 0x00000002, 0xF5DE021C, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8A, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021C, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021C, 0xFFFFFFA8, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000024, 0x00000261, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80241E8C_98C89C
-.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021D, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021D, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021D, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021D, 0x00000024, 0x00000002, 0xF5DE021D, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8B, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021D, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021D, 0xFFFFFFD4, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021D, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021D, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021D, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021D, 0x00000024, 0x00000002, 0xF5DE021D, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8B, 0x00000024, 0x00000002, 0xFD050F8B, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021D, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021D, 0xFFFFFFD4, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000022, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242154_98CB64
-.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021E, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002A, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021E, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021E, 0x00000024, 0x00000002, 0xF5DE021E, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8C, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021E, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021E, 0x00000000, 0xFFFFFE04, 0x000001FE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002A, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021E, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002A, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021E, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021E, 0x00000024, 0x00000002, 0xF5DE021E, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8C, 0x00000024, 0x00000002, 0xFD050F8C, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021E, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021E, 0x00000000, 0xFFFFFE04, 0x000001FE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000002A, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024241C_98CE2C
-.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021F, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021F, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000028, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021F, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021F, 0x00000024, 0x00000002, 0xF5DE021F, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8D, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021F, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021F, 0x0000002C, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000028, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE021F, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE021F, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000028, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE021F, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE021F, 0x00000024, 0x00000002, 0xF5DE021F, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8D, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE021F, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE021F, 0x0000002C, 0xFFFFFE04, 0x000001FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000028, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802426E4_98D0F4
-.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE0220, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE0220, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000026, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE0220, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE0220, 0x00000024, 0x00000002, 0xF5DE0220, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8E, 0x00000024, 0x00000002, 0xFD050F8E, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0220, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE0220, 0x00000058, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000026, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
+.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFC7, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE0220, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, func_802400B0_98AAC0, 0xF5DE0220, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0162, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000026, 0x00000261, 0x00000000, 0x00000043, 0x00000002, AddKeyItem, 0xF5DE0220, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE0220, 0x00000024, 0x00000002, 0xF5DE0220, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F8E, 0x00000024, 0x00000002, 0xFD050F8E, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0159, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0220, 0xFE363C82, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0xF5DE0220, 0x00000058, 0xFFFFFE04, 0x000001F6, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000026, 0x00000261, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s b/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s
index 9e02f58e26..0073dbdfe2 100644
--- a/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s
+++ b/ver/us/asm/data/world/area_iwa/iwa_02/917220.data.s
@@ -69,10 +69,10 @@ glabel D_802427BC_91852C
 .word 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00990103, 0x00990102, 0x00000000, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024284C_9185BC
-.word 0x0000000A, 0x00000002, 0xF8405E4C, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990105, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990102, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24AA280, 0x00000000, 0x0000015E, 0xF24AB680, 0xF24A6080, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x000D001F, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241DAC_917B1C, 0x00000043, 0x00000002, AddKeyItem, 0x0000002C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x000D0020, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24AA280, 0x00000024, 0x00000002, 0xF8405E4C, 0x00000001, 0x00000043, 0x00000003, SetTattleString, 0x00000005, 0x001A0088, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0021, 0x00000024, 0x00000002, 0xFE363C81, 0x000D0022, 0x00000018, 0x00000001, 0x00000020, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0023, 0x00000024, 0x00000002, 0xFE363C81, 0x000D0024, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0025, 0x00000024, 0x00000002, 0xFE363C81, 0x000D0026, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802427BC_91852C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405E4C, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990105, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990102, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24AA280, 0x00000000, 0x0000015E, 0xF24AB680, 0xF24A6080, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x000D001F, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241DAC_917B1C, 0x00000043, 0x00000002, AddKeyItem, 0x0000002C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990103, 0x00990102, 0x00000000, 0x000D0020, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24AA280, 0x00000024, 0x00000002, 0xF8405E4C, 0x00000001, 0x00000043, 0x00000003, SetTattleMsg, 0x00000005, 0x001A0088, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0021, 0x00000024, 0x00000002, 0xFE363C81, 0x000D0022, 0x00000018, 0x00000001, 0x00000020, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0023, 0x00000024, 0x00000002, 0xFE363C81, 0x000D0024, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000D0025, 0x00000024, 0x00000002, 0xFE363C81, 0x000D0026, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802427BC_91852C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242A70_9187E0
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024284C_9185BC, 0x0000000A, 0x00000002, 0xF8405E4C, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990107, 0x00000043, 0x00000003, SetTattleString, 0x00000005, 0x001A0087, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024284C_9185BC, 0x0000000A, 0x00000002, 0xF8405E4C, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990107, 0x00000043, 0x00000003, SetTattleMsg, 0x00000005, 0x001A0087, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242AEC_91885C
 .word 0x00000005, D_80241D7C_917AEC, 0x44866000, 0x42480000, 0x43660000, 0x00000801, D_80242A70_9187E0, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990102, 0x0099010E, 0x0099010E, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00990102, 0x00000000, 0x00000000, 0x00000000, 0x001A0088, 0x00000001, D_80241E0C_917B7C, 0x09030002, 0x00000001, D_80241FFC_917D6C, 0x09010002, 0x00000001, D_802421EC_917F5C, 0x09000002, 0x00000002, D_802423DC_91814C, 0x09050002, 0x00000001, D_80242AEC_91885C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 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 2e0fa19393..d02b0bde95 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
@@ -75,7 +75,7 @@ glabel D_80244874_B30CE4
 .word 0x00000045, 0x00000002, D_802446A8_B30B18, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802446E8_B30B58, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244924_B30D94
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_02_Set80151310_1, 0x00000043, 0x00000001, jan_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80243388_B2F7F8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243AB0_B2FF20, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241D84_B2E1F4, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243B24_B2FF94, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242678_B2EAE8, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241D00_B2E170, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_8024211C_B2E58C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802447C4_B30C34, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244874_B30CE4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242138_B2E5A8, 0x00000043, 0x00000001, func_80241F9C_B2E40C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000044, 0x00000001, D_80243620_B2FA90, 0x00000043, 0x00000001, jan_02_UnkFunc29, 0x00000043, 0x00000001, jan_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_02_Set80151310_1, 0x00000043, 0x00000001, jan_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80243388_B2F7F8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243AB0_B2FF20, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241D84_B2E1F4, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243B24_B2FF94, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242678_B2EAE8, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241D00_B2E170, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_8024211C_B2E58C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802447C4_B30C34, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80242050_B2E4C0, 0x0000000F, 0x00000043, 0x00000001, func_80242104_B2E574, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244874_B30CE4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242084_B2E4F4, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242138_B2E5A8, 0x00000043, 0x00000001, func_80241F9C_B2E40C, 0x00000046, 0x00000001, D_802432D8_B2F748, 0x00000044, 0x00000001, D_80243620_B2FA90, 0x00000043, 0x00000001, jan_02_UnkFunc29, 0x00000043, 0x00000001, jan_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245654_B31AC4
 .word 0x00000043, 0x00000001, func_80241750_B2DBC0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, jan_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 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 fba2c7df1e..69354a2df3 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
@@ -192,7 +192,7 @@ glabel D_80248DF4_B3D9C4
 .word 0x00000045, 0x00000002, D_80248C28_B3D7F8, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80248C68_B3D838, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248EA4_B3DA74
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_03_Set80151310_1, 0x00000043, 0x00000001, jan_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_80247908_B3C4D8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80248030_B3CC00, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024230C_B36EDC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802480A4_B3CC74, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242C00_B377D0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242288_B36E58, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802426A4_B37274, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248D44_B3D914, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248DF4_B3D9C4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802426C0_B37290, 0x00000043, 0x00000001, func_80242524_B370F4, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000044, 0x00000001, D_80247BA0_B3C770, 0x00000043, 0x00000001, jan_03_UnkFunc29, 0x00000043, 0x00000001, jan_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, jan_03_Set80151310_1, 0x00000043, 0x00000001, jan_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_80247908_B3C4D8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80248030_B3CC00, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024230C_B36EDC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802480A4_B3CC74, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242C00_B377D0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80242288_B36E58, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802426A4_B37274, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, jan_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248D44_B3D914, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80247768_B3C338, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802425D8_B371A8, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B3725C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248DF4_B3D9C4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024260C_B371DC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802426C0_B37290, 0x00000043, 0x00000001, func_80242524_B370F4, 0x00000046, 0x00000001, D_80247858_B3C428, 0x00000044, 0x00000001, D_80247BA0_B3C770, 0x00000043, 0x00000001, jan_03_UnkFunc29, 0x00000043, 0x00000001, jan_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249BD4_B3E7A4
 .word 0x00000043, 0x00000001, func_80241CD8_B368A8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, jan_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s
index 173ce2a85b..b5a9f9e394 100644
--- a/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s
+++ b/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s
@@ -33,10 +33,10 @@ glabel D_80242570_B46CE0
 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000E, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000A, 0x00000002, 0xF840604A, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000037, 0x00000096, 0xFFFFFFA1, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000005A, 0x0000008C, 0xFFFFFFAB, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFF6, 0x00000070, 0xFFFFFFB0, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802421EC_B4695C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242714_B46E84
-.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF840607C, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990305, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990302, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000A8, 0x00000024, 0x00000002, 0xF840607C, 0x00000001, 0x00000043, 0x00000003, SetTattleString, 0x00000001, 0x001A00D2, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000A9, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AA, 0x00000018, 0x00000001, 0x0000002A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AB, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF840607C, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990305, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990302, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000A8, 0x00000024, 0x00000002, 0xF840607C, 0x00000001, 0x00000043, 0x00000003, SetTattleMsg, 0x00000001, 0x001A00D2, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000A9, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AA, 0x00000018, 0x00000001, 0x0000002A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AB, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802428E4_B47054
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242714_B46E84, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000015, 0x0000000A, 0x00000002, 0xF840607C, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990307, 0x00000043, 0x00000003, SetTattleString, 0x00000001, 0x001A003B, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242714_B46E84, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000015, 0x0000000A, 0x00000002, 0xF840607C, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990307, 0x00000043, 0x00000003, SetTattleMsg, 0x00000001, 0x001A003B, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242978_B470E8
 .word 0x00000000, D_80241A40_B461B0, 0x00000000, 0xC47A0000, 0x00000000, 0x00400F09, D_80242570_B46CE0, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241A7C_B461EC, 0xC3660000, 0x00000000, 0xC3A00000, 0x00400D09, D_802428E4_B47054, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00990302, 0x0099030E, 0x0099030E, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00000000, 0x00000000, 0x00000000, 0x001A00D2
diff --git a/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s b/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s
index 569b2f34a5..56c1314438 100644
--- a/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s
+++ b/ver/us/asm/data/world/area_kkj/kkj_17/AF2520.data.s
@@ -18,7 +18,7 @@ glabel D_80240AA0_AF2700
 .word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x0014018E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x0014018F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140190, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140191, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140192, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140193, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240BD4_AF2834
-.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802402BC_AF1F1C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140194, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140195, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140196, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140197, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000046, 0x00000001, D_80240940_AF25A0, 0x00000043, 0x00000002, kkj_17_GetItemName, 0xFE363C89, 0x00000043, 0x00000003, SetMessageString, 0xFE363C89, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00140198, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802409F0_AF2650, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802402BC_AF1F1C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140194, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0026, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140195, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00200009, 0x00200001, 0x00000000, 0x00140196, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFE, 0x000C0001, 0x000C0026, 0x00000000, 0xFFFFFFFC, 0x00140197, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000C0002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x000A0001, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000046, 0x00000001, D_80240940_AF25A0, 0x00000043, 0x00000002, kkj_17_GetItemName, 0xFE363C89, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C89, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00140198, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802409F0_AF2650, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240D9C_AF29FC
 .word 0x00000046, 0x00000001, D_80240940_AF25A0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, func_802402BC_AF1F1C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D4, 0x000000A0, 0x00000028, 0x0000001D, 0x00000001, 0x0000010D, 0x0000001D, 0x00000001, 0x00000129, 0x0000001D, 0x00000001, 0x00000111, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000003, AddBadge, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000001, func_80240500_AF2160, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_80240568_AF21C8, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D5, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000002, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000001, func_80240500_AF2160, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802409F0_AF2650, 0x00000002, 0x00000000, 0x00000001, 0x00000000
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 6b0f661f8a..ebab6c9d17 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
@@ -27,7 +27,7 @@ glabel D_802422C4_AF9C14
 .word 0x0000000B, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0xF70F2E82, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242340_AF9C90
-.word 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005D, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005E, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000060, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000062, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000063, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000064, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000065, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000066, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x0000000A, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E7, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C89, 0xF70F2E82, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C89, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C89, 0x00000000, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E9, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000002, SwitchMessage, 0x001400EA, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageString, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E6, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, SwitchMessage, 0x001400E8, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005D, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005E, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000061, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000060, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000062, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000063, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000064, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000065, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000066, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718892, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x0000000A, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E7, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C89, 0xF70F2E82, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C89, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C89, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E9, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, kkj_19_GetFloorCollider, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000011, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000016, 0x00000001, 0x00000012, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000016, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000016, 0x00000001, 0x00000015, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000016, 0x00000001, 0x00000016, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000016, 0x00000001, 0x00000017, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000016, 0x00000001, 0x00000018, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000016, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000016, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xFE363C8B, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8B, 0x00000043, 0x00000002, SwitchMessage, 0x001400EA, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_80240B8C_AF84DC, 0xFE363C8A, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001400E6, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E002B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_802422C4_AF9C14, 0x00000043, 0x00000002, SwitchMessage, 0x001400E8, 0x00000012, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718892, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242A18_AFA368
 .word 0x0000000A, 0x00000002, 0xF70F2E80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000043, 0x00000002, func_80240C10_AF8560, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E80, 0x00000016, 0x00000001, 0x00000001, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000005D, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000016, 0x00000001, 0x0000005F, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E84, 0x00000043, 0x00000007, MakeItemEntity, 0x00000163, 0x0000011F, 0x00000010, 0xFFFFFFD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000065, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000016, 0x00000001, 0x00000062, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000023, 0x00000000, 0x0000000D, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000014, 0x00000001, 0xF70F2E83, 0x00000016, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000060, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000061, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000023, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xF70F2E85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000061, 0x0000000A, 0x00000002, 0xF971888F, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000165, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015E, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000164, 0x0000011F, 0x00000014, 0xFFFFFFE2, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0xFE363C80, 0x00000024, 0x00000002, 0xF971888F, 0x00000001, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
index 717a8a5ac5..d0c177317e 100644
--- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
+++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s
@@ -54,7 +54,7 @@ glabel D_80246C60_8B6CD0
 .word 0x00000045, 0x00000002, D_80246A94_8B6B04, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80246AD4_8B6B44, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246D10_8B6D80
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, kmr_02_Set80151310_1, 0x00000043, 0x00000001, kmr_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245774_8B57E4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245E9C_8B5F0C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240B00_8B0B70, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80245F10_8B5F80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802413F4_8B1464, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240A7C_8B0AEC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240E98_8B0F08, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246BB0_8B6C20, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246C60_8B6CD0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240EB4_8B0F24, 0x00000043, 0x00000001, func_80240D18_8B0D88, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000044, 0x00000001, D_80245A0C_8B5A7C, 0x00000043, 0x00000001, kmr_02_UnkFunc29, 0x00000043, 0x00000001, kmr_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, kmr_02_Set80151310_1, 0x00000043, 0x00000001, kmr_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245774_8B57E4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245E9C_8B5F0C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240B00_8B0B70, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80245F10_8B5F80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802413F4_8B1464, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240A7C_8B0AEC, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240E98_8B0F08, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, kmr_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246BB0_8B6C20, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240DCC_8B0E3C, 0x0000000F, 0x00000043, 0x00000001, func_80240E80_8B0EF0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246C60_8B6CD0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240E00_8B0E70, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240EB4_8B0F24, 0x00000043, 0x00000001, func_80240D18_8B0D88, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000044, 0x00000001, D_80245A0C_8B5A7C, 0x00000043, 0x00000001, kmr_02_UnkFunc29, 0x00000043, 0x00000001, kmr_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247A40_8B7AB0
 .word 0x00000043, 0x00000001, func_802404CC_8B053C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, kmr_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
index 51257d1930..fd322e03b9 100644
--- a/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s
@@ -63,7 +63,7 @@ glabel D_80247450_7F2160
 .word 0x00000045, 0x00000002, D_80247284_7F1F94, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802472C4_7F1FD4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247500_7F2210
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_00_Set80151310_1, 0x00000043, 0x00000001, mac_00_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245F64_7F0C74, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024668C_7F139C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240DA0_7EBAB0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246700_7F1410, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241694_7EC3A4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240D1C_7EBA2C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241138_7EBE48, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802473A0_7F20B0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247450_7F2160, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241154_7EBE64, 0x00000043, 0x00000001, func_80240FB8_7EBCC8, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000044, 0x00000001, D_802461FC_7F0F0C, 0x00000043, 0x00000001, mac_00_UnkFunc29, 0x00000043, 0x00000001, mac_00_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_00_Set80151310_1, 0x00000043, 0x00000001, mac_00_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245F64_7F0C74, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024668C_7F139C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240DA0_7EBAB0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246700_7F1410, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241694_7EC3A4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240D1C_7EBA2C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241138_7EBE48, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_00_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802473A0_7F20B0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024106C_7EBD7C, 0x0000000F, 0x00000043, 0x00000001, func_80241120_7EBE30, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247450_7F2160, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802410A0_7EBDB0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241154_7EBE64, 0x00000043, 0x00000001, func_80240FB8_7EBCC8, 0x00000046, 0x00000001, D_80245EB4_7F0BC4, 0x00000044, 0x00000001, D_802461FC_7F0F0C, 0x00000043, 0x00000001, mac_00_UnkFunc29, 0x00000043, 0x00000001, mac_00_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248230_7F2F40
 .word 0x00000043, 0x00000001, func_8024076C_7EB47C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_00_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
index eac76115a8..3022522bd6 100644
--- a/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s
@@ -96,7 +96,7 @@ glabel D_8024A2C0_80AB40
 .word 0x00000045, 0x00000002, D_8024A0F4_80A974, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_8024A134_80A9B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A370_80ABF0
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_01_Set80151310_1, 0x00000043, 0x00000001, mac_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_80248DD4_809654, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802494FC_809D7C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242680_802F00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80249570_809DF0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242980_803200, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242F74_8037F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_802425FC_802E7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242A18_803298, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024A210_80AA90, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_8024A2C0_80AB40, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242980_803200, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242A34_8032B4, 0x00000043, 0x00000001, func_80242898_803118, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000044, 0x00000001, D_8024906C_8098EC, 0x00000043, 0x00000001, mac_01_UnkFunc29, 0x00000043, 0x00000001, mac_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_01_Set80151310_1, 0x00000043, 0x00000001, mac_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_80248DD4_809654, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802494FC_809D7C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242680_802F00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80249570_809DF0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242980_803200, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242F74_8037F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_802425FC_802E7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242A18_803298, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_8024A210_80AA90, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024294C_8031CC, 0x0000000F, 0x00000043, 0x00000001, func_80242A00_803280, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_8024A2C0_80AB40, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242980_803200, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242A34_8032B4, 0x00000043, 0x00000001, func_80242898_803118, 0x00000046, 0x00000001, D_80248D24_8095A4, 0x00000044, 0x00000001, D_8024906C_8098EC, 0x00000043, 0x00000001, mac_01_UnkFunc29, 0x00000043, 0x00000001, mac_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024B0A0_80B920
 .word 0x00000043, 0x00000001, func_8024204C_8028CC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
index f8bcdfac51..599c87e221 100644
--- a/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_02/828F10.data.s
@@ -93,7 +93,7 @@ glabel D_802477E0_82AAA0
 .word 0x00000045, 0x00000002, D_80247614_82A8D4, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80247654_82A914, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247890_82AB50
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246244_829504, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_02_Set80151310_1, 0x00000043, 0x00000001, mac_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_802462F4_8295B4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246A1C_829CDC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241F30_8251F0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246A90_829D50, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242824_825AE4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241EAC_82516C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802422C8_825588, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247730_82A9F0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802477E0_82AAA0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802422E4_8255A4, 0x00000043, 0x00000001, func_80242148_825408, 0x00000046, 0x00000001, D_80246244_829504, 0x00000044, 0x00000001, D_8024658C_82984C, 0x00000043, 0x00000001, mac_02_UnkFunc29, 0x00000043, 0x00000001, mac_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246244_829504, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_02_Set80151310_1, 0x00000043, 0x00000001, mac_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_802462F4_8295B4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246A1C_829CDC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241F30_8251F0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246A90_829D50, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242824_825AE4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241EAC_82516C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802422C8_825588, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247730_82A9F0, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802421FC_8254BC, 0x0000000F, 0x00000043, 0x00000001, func_802422B0_825570, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802477E0_82AAA0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242230_8254F0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802422E4_8255A4, 0x00000043, 0x00000001, func_80242148_825408, 0x00000046, 0x00000001, D_80246244_829504, 0x00000044, 0x00000001, D_8024658C_82984C, 0x00000043, 0x00000001, mac_02_UnkFunc29, 0x00000043, 0x00000001, mac_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802485C0_82B880
 .word 0x00000043, 0x00000001, func_802418FC_824BBC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -165,7 +165,7 @@ glabel D_80249550_82C810
 .word 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001D, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001E, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80249548_82C808, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802488C4_82BB84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004001F, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040020, 0x00000024, 0x00000002, 0xF8405C9A, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249684_82C944
-.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8405C98, 0x00000000, 0x00000024, 0x00000002, 0xF8405C98, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040003, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040005, 0x00000003, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040006, 0x00000043, 0x00000002, ShowChoice, 0x001E0009, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9A, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040007, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000043, 0x00000003, AddItem, 0xFE363C88, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040008, 0x00000043, 0x00000002, ShowChoice, 0x001E0008, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C89, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C81, 0x00000043, 0x00000003, SetMessageString, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000B, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242DBC_82607C, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, RemoveItem, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242C44_825F04, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xF8405C9A, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000003, 0x00000001, 0x00000006, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000D, 0x00000046, 0x00000001, D_802490F8_82C3B8, 0x00000014, 0x00000001, 0xFE363C87, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040012, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000F, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040010, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040013, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040011, 0x00000023, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040014, 0x00000043, 0x00000002, func_80242F60_826220, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000003, AddItem, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040015, 0x00000003, 0x00000001, 0x00000009, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xF8405C98, 0x00000000, 0x00000024, 0x00000002, 0xF8405C98, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040003, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040005, 0x00000003, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040006, 0x00000043, 0x00000002, ShowChoice, 0x001E0009, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9A, 0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80243040_826300, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040007, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000043, 0x00000001, func_802430D0_826390, 0x00000024, 0x00000002, 0xFE363C80, 0x8024E8A8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80248A48_82BD08, 0x00000043, 0x00000003, AddItem, 0xFE363C88, 0xFE363C81, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040008, 0x00000043, 0x00000002, ShowChoice, 0x001E0008, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040004, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C89, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C81, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000B, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242DBC_82607C, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000043, 0x00000003, RemoveItem, 0xFE363C89, 0xFE363C80, 0x00000004, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C88, 0x00000043, 0x00000002, mac_02_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000C, 0x00000004, 0x00000001, 0x00000009, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80242C44_825F04, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xF8405C9A, 0x00000043, 0x00000003, RemoveItem, 0xFE363C88, 0xFE363C80, 0x00000003, 0x00000001, 0x00000006, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000D, 0x00000046, 0x00000001, D_802490F8_82C3B8, 0x00000014, 0x00000001, 0xFE363C87, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040012, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x0004000F, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040010, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040013, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040011, 0x00000023, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040014, 0x00000043, 0x00000002, func_80242F60_826220, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000003, AddItem, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00AA0004, 0x00AA0001, 0x00000000, 0x00040015, 0x00000003, 0x00000001, 0x00000009, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024A034_82D2F4
 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFFD, 0x00000046, 0x00000001, D_8024926C_82C52C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000029, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000046, 0x00000001, D_80249684_82C944, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80249550_82C810, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -261,10 +261,10 @@ glabel D_8024C7DC_82FA9C
 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C618_82F8D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024C800_82FAC0
-.word 0x0000000A, 0x00000002, 0xF8405C9B, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990007, 0x00990007, 0x00000000, 0x00040085, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990005, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990002, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00040086, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddKeyItem, 0x0000002B, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00040087, 0x00000024, 0x00000002, 0xF8405C9B, 0x00000001, 0x00000043, 0x00000003, SetTattleString, 0x00000002, 0x001A003C, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000018, 0x00000001, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C80, 0x00040088, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00040089, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008A, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008B, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008C, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008D, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008E, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00990003, 0x00990002, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405C9B, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990007, 0x00990007, 0x00000000, 0x00040085, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990005, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990002, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00040086, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddKeyItem, 0x0000002B, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990003, 0x00990002, 0x00000000, 0x00040087, 0x00000024, 0x00000002, 0xF8405C9B, 0x00000001, 0x00000043, 0x00000003, SetTattleMsg, 0x00000002, 0x001A003C, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000018, 0x00000001, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C80, 0x00040088, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00040089, 0x00000018, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008A, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008B, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008C, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008D, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008E, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0004008E, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00990003, 0x00990002, 0x00000000, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024CA88_82FD48
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C800_82FAC0, 0x0000000A, 0x00000002, 0xF8405C9B, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990007, 0x00000043, 0x00000003, SetTattleString, 0x00000002, 0x001A003B, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C800_82FAC0, 0x0000000A, 0x00000002, 0xF8405C9B, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990007, 0x00000043, 0x00000003, SetTattleMsg, 0x00000002, 0x001A003B, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024CB04_82FDC4
 .word 0x00AA0000, 0x00AA0001, 0x00AA0002, 0x00AA0001, 0x00AA0004, 0x00AA0005, 0x00AA0006, 0x00AA0007, 0x00AA0008, 0xFFFFFFFF
diff --git a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
index c2b416f283..dfb7e5b7a7 100644
--- a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s
@@ -81,7 +81,7 @@ glabel D_80247CD4_8394D4
 .word 0x00000045, 0x00000002, D_80247B08_839308, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80247B48_839348, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247D84_839584
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_03_Set80151310_1, 0x00000043, 0x00000001, mac_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802467E8_837FE8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246F10_838710, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240C20_832420, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246F84_838784, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240F20_832720, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241514_832D14, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B9C_83239C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240FB8_8327B8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247C24_839424, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247CD4_8394D4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240F20_832720, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240FD4_8327D4, 0x00000043, 0x00000001, func_80240E38_832638, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000044, 0x00000001, D_80246A80_838280, 0x00000043, 0x00000001, mac_03_UnkFunc29, 0x00000043, 0x00000001, mac_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_03_Set80151310_1, 0x00000043, 0x00000001, mac_03_UnkAlphaFunc, 0x00000044, 0x00000001, D_802467E8_837FE8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246F10_838710, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240C20_832420, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246F84_838784, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240F20_832720, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241514_832D14, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B9C_83239C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240FB8_8327B8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_03_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247C24_839424, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240EEC_8326EC, 0x0000000F, 0x00000043, 0x00000001, func_80240FA0_8327A0, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247CD4_8394D4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240F20_832720, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240FD4_8327D4, 0x00000043, 0x00000001, func_80240E38_832638, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000044, 0x00000001, D_80246A80_838280, 0x00000043, 0x00000001, mac_03_UnkFunc29, 0x00000043, 0x00000001, mac_03_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248AB4_83A2B4
 .word 0x00000043, 0x00000001, func_802405EC_831DEC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_03_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
index 9ed77122f8..5c32921447 100644
--- a/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s
@@ -78,7 +78,7 @@ glabel D_80245678_848248
 .word 0x00000045, 0x00000002, D_802454AC_84807C, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802454EC_8480BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245728_8482F8
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_04_Set80151310_1, 0x00000043, 0x00000001, mac_04_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024418C_846D5C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802448B4_847484, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240BD0_8437A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80244928_8474F8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802414C4_844094, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B4C_84371C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240F68_843B38, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802455C8_848198, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80245678_848248, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240F84_843B54, 0x00000043, 0x00000001, func_80240DE8_8439B8, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000044, 0x00000001, D_80244424_846FF4, 0x00000043, 0x00000001, mac_04_UnkFunc29, 0x00000043, 0x00000001, mac_04_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_04_Set80151310_1, 0x00000043, 0x00000001, mac_04_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024418C_846D5C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000014, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_802448B4_847484, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240BD0_8437A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80244928_8474F8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_802414C4_844094, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240B4C_84371C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80240F68_843B38, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_04_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802455C8_848198, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243FEC_846BBC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80240E9C_843A6C, 0x0000000F, 0x00000043, 0x00000001, func_80240F50_843B20, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80245678_848248, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000014, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240ED0_843AA0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80240F84_843B54, 0x00000043, 0x00000001, func_80240DE8_8439B8, 0x00000046, 0x00000001, D_802440DC_846CAC, 0x00000044, 0x00000001, D_80244424_846FF4, 0x00000043, 0x00000001, mac_04_UnkFunc29, 0x00000043, 0x00000001, mac_04_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80246458_849028
 .word 0x00000043, 0x00000001, func_8024059C_84316C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_04_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -180,7 +180,7 @@ glabel D_8024911C_84BCEC
 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80248E2C_84B9FC, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF9, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00880001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249184_84BD54
-.word 0x0000000A, 0x00000002, 0xF8405CA3, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A8, 0x00000024, 0x00000002, 0xF8405CA3, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A9, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_Call800E9894, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0x001E000E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AA, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_GetPlayerCoins, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000027, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AB, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B90_844760, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AC, 0x00000043, 0x00000002, ShowChoice, 0x001E000B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AD, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D1, 0x00000016, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C84, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D2, 0x00000016, 0x00000001, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D3, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600B1, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFD9, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetMessageString, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AE, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x0000024B, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C87, 0x0000001A, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60006, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60001, 0x00000043, 0x00000001, func_80241A64_844634, 0x00000043, 0x00000002, func_802418AC_84447C, 0xFE363C86, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600AF, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600B0, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x00002098, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF97188B2, 0x00000001, 0x00000043, 0x00000001, func_80241C60_844830, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405CA3, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A8, 0x00000024, 0x00000002, 0xF8405CA3, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000600A9, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_Call800E9894, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0x001E000E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AA, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_04_GetPlayerCoins, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000027, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AB, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241B90_844760, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, SetMessageValue, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AC, 0x00000043, 0x00000002, ShowChoice, 0x001E000B, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AD, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D1, 0x00000016, 0x00000001, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C84, 0x00000028, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D2, 0x00000016, 0x00000001, 0x00000002, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x001D00D3, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600B1, 0x00000043, 0x00000001, func_80241C40_844810, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFD9, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0x000600AE, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x0000024B, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C87, 0x0000001A, 0x00000043, 0x0000000F, PlayEffect, 0x00000038, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60006, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00A60001, 0x00000043, 0x00000001, func_80241A64_844634, 0x00000043, 0x00000002, func_802418AC_84447C, 0xFE363C86, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600AF, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000600B0, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00A60004, 0x00A60001, 0x00000000, 0xFE363C87, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000D, 0x00002098, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF97188B2, 0x00000001, 0x00000043, 0x00000001, func_80241C60_844830, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802497B0_84C380
 .word 0x0000000A, 0x00000002, 0xF97188B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, func_802419E4_8445B4, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000026, 0x00000034, 0x00000043, 0x00000003, func_80241BB8_844788, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00010000, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249184_84BD54, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
index cfb08dde9b..c6f8faef12 100644
--- a/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
+++ b/ver/us/asm/data/world/area_mac/mac_05/857070.data.s
@@ -72,7 +72,7 @@ glabel D_80246740_8588B0
 .word 0x00000045, 0x00000002, D_80246574_8586E4, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802465B4_858724, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802467F0_858960
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_05_Set80151310_1, 0x00000043, 0x00000001, mac_05_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245254_8573C4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024597C_857AEC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241A90_853C00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802459F0_857B60, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242384_8544F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241A0C_853B7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241E28_853F98, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246690_858800, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246740_8588B0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241E44_853FB4, 0x00000043, 0x00000001, func_80241CA8_853E18, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000044, 0x00000001, D_802454EC_85765C, 0x00000043, 0x00000001, mac_05_UnkFunc29, 0x00000043, 0x00000001, mac_05_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_05_Set80151310_1, 0x00000043, 0x00000001, mac_05_UnkAlphaFunc, 0x00000044, 0x00000001, D_80245254_8573C4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024597C_857AEC, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80241A90_853C00, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802459F0_857B60, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242384_8544F4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241A0C_853B7C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241E28_853F98, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_05_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246690_858800, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241D5C_853ECC, 0x0000000F, 0x00000043, 0x00000001, func_80241E10_853F80, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246740_8588B0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241D90_853F00, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241E44_853FB4, 0x00000043, 0x00000001, func_80241CA8_853E18, 0x00000046, 0x00000001, D_802451A4_857314, 0x00000044, 0x00000001, D_802454EC_85765C, 0x00000043, 0x00000001, mac_05_UnkFunc29, 0x00000043, 0x00000001, mac_05_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247520_859690
 .word 0x00000043, 0x00000001, func_8024145C_8535CC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_05_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -261,7 +261,7 @@ glabel D_8024D704_85F874
 .word 0x00000068, 0x00000000
 
 glabel D_8024D70C_85F87C
-.word 0x00000024, 0x00000002, 0xF8405CB5, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFCA, 0x0000000A, 0x00000002, 0xF97188BE, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070070, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070071, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA5, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070072, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x008E0003, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x008E0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070073, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070074, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070075, 0x00000024, 0x00000002, 0xFE363C80, 0x00000067, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddKeyItem, 0x00000067, 0x00000024, 0x00000002, 0xF8405CA5, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000001, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070081, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070082, 0x00000024, 0x00000002, 0xF97188BD, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000068, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070076, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070077, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070078, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070079, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024D704_85F874, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000046, 0x00000001, D_80247824_859994, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007A, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007B, 0x00000024, 0x00000002, 0xF8405CA6, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007007C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007007E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000A7, 0xFFFFFDFF, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000070, 0xFFFFFE01, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0x00000046, 0xFFFFFDE4, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000070, 0x00000000, 0xFFFFFE01, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000070, 0x00000000, 0xFFFFFE01, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x802442C4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00830006, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008E0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000008C, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0005, 0x00000008, 0x00000001, 0x00000096, 0x00000008, 0x00000001, 0x00000096, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00830001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008E0001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, 0x802442E8, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFFFFFFAB, 0xFFFFFDF8, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x000000D0, 0xFFFFFDEE, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070080, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000145, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000003, AddBadge, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000003, SetTattleString, 0x00000009, 0x001A0058, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xF8405CB5, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFCA, 0x0000000A, 0x00000002, 0xF97188BE, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070070, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070071, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA5, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070072, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x008E0003, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x008E0001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070073, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070074, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070075, 0x00000024, 0x00000002, 0xFE363C80, 0x00000067, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddKeyItem, 0x00000067, 0x00000024, 0x00000002, 0xF8405CA5, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000001, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070081, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070082, 0x00000024, 0x00000002, 0xF97188BD, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000068, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070076, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070077, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x0000000A, 0x00000002, 0xF97188BD, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070078, 0x00000024, 0x00000002, 0xF97188BD, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x00070079, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024D704_85F874, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000046, 0x00000001, D_80247824_859994, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007A, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007B, 0x00000024, 0x00000002, 0xF8405CA6, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007007C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007007E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x000000A7, 0xFFFFFDFF, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000070, 0xFFFFFE01, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0x00000046, 0xFFFFFDE4, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000070, 0x00000000, 0xFFFFFE01, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000070, 0x00000000, 0xFFFFFE01, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x802442C4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00830006, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008E0005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000008C, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0005, 0x00000008, 0x00000001, 0x00000096, 0x00000008, 0x00000001, 0x00000096, 0x00000008, 0x00000001, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00830001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x008E0001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, 0x802442E8, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFFFFFFAB, 0xFFFFFDF8, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00AC0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x000000D0, 0xFFFFFDEE, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00AD0001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x008E0002, 0x008E0001, 0x00000000, 0x0007007F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070080, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000145, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000003, AddBadge, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000003, SetTattleMsg, 0x00000009, 0x001A0058, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024E1D0_860340
 .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024D70C_85F87C, 0x00000024, 0x00000002, 0xF97188BD, 0x00000000, 0x00000024, 0x00000002, 0xF97188BE, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CB5, 0x00000001, 0x00000024, 0x00000002, 0xF97188BE, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -273,7 +273,7 @@ glabel D_8024E3A0_860510
 .word 0x0000000A, 0x00000002, 0xF8405CA5, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070068, 0x00000024, 0x00000002, 0xF97188BF, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x00070069, 0x00000024, 0x00000002, 0xF97188BF, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006A, 0x00000024, 0x00000002, 0xF97188BF, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006B, 0x00000024, 0x00000002, 0xF97188BF, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF97188BF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006C, 0x00000024, 0x00000002, 0xF97188BF, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006D, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006E, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AD0004, 0x00AD0001, 0x00000000, 0x0007006F, 0x00000044, 0x00000001, D_8024E23C_8603AC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024E5DC_86074C
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024E3A0_860510, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000001, 0x00000043, 0x00000003, SetTattleString, 0x00000009, 0x001A0058, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024E3A0_860510, 0x0000000A, 0x00000002, 0xF8405CA6, 0x00000001, 0x00000043, 0x00000003, SetTattleMsg, 0x00000009, 0x001A0058, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_8024E62C_86079C
 .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000001, filemenu_update_show_name_input_8554F0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700BF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802433BC_85552C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627D, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C1, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000046, 0x00000001, D_802479A8_859B18, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C5, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x000000AC, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C2, 0x00000024, 0x00000002, 0xFE363C80, 0x000000BB, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000003, AddItem, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C3, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000002CD, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF840627D, 0x00000000, 0x00000027, 0x00000002, 0xF5DE02E2, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830404, 0x00830401, 0x00000000, 0x000700C4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s b/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s
index 51cb22289b..5abbf8b0f5 100644
--- a/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s
+++ b/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s
@@ -24,10 +24,10 @@ glabel D_80242618_B9FF78
 .word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242678_B9FFD8
-.word 0x0000000A, 0x00000002, 0xF8405F22, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990205, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990202, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x000E000F, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80242618_B9FF78, 0x00000043, 0x00000002, AddKeyItem, 0x0000002D, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x000E0010, 0x00000024, 0x00000002, 0xF8405F22, 0x00000001, 0x00000043, 0x00000003, SetTattleString, 0x00000000, 0x001A00A3, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0011, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0012, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0013, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0014, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0015, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0016, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00990203, 0x00990202, 0x00000000, 0xFE363C80, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00990203, 0x00990202, 0x00000000, 0xFE363C81, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xF8405F22, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990205, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990202, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x000E000F, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80242618_B9FF78, 0x00000043, 0x00000002, AddKeyItem, 0x0000002D, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x000E0010, 0x00000024, 0x00000002, 0xF8405F22, 0x00000001, 0x00000043, 0x00000003, SetTattleMsg, 0x00000000, 0x001A00A3, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0011, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0012, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0013, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0014, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0015, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0016, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00990203, 0x00990202, 0x00000000, 0xFE363C80, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00990203, 0x00990202, 0x00000000, 0xFE363C81, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802428D8_BA0238
-.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242678_B9FFD8, 0x0000000A, 0x00000002, 0xF8405F22, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990207, 0x00000043, 0x00000003, SetTattleString, 0x00000000, 0x001A00A2, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242678_B9FFD8, 0x0000000A, 0x00000002, 0xF8405F22, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990207, 0x00000043, 0x00000003, SetTattleMsg, 0x00000000, 0x001A00A2, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80242954_BA02B4
 .word 0x00000001, D_802425AC_B9FF0C, 0x43700000, 0x00000000, 0xC3700000, 0x00400400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000000F0, 0x00000000, 0xFFFFFF10, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000F0, 0x00000000, 0xFFFFFF10, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000
diff --git a/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s b/ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s
index b375b4bbe0..16d22de85f 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
@@ -156,7 +156,7 @@ glabel D_802475D4_9CC9B4
 .word 0x00000045, 0x00000002, D_80247408_9CC7E8, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80247448_9CC828, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80247684_9CCA64
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_01_Set80151310_1, 0x00000043, 0x00000001, nok_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_802460E8_9CB4C8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246810_9CBBF0, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802414D8_9C68B8, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246884_9CBC64, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241DCC_9C71AC, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241454_9C6834, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241870_9C6C50, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247524_9CC904, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802475D4_9CC9B4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024188C_9C6C6C, 0x00000043, 0x00000001, func_802416F0_9C6AD0, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000044, 0x00000001, D_80246380_9CB760, 0x00000043, 0x00000001, nok_01_UnkFunc29, 0x00000043, 0x00000001, nok_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_01_Set80151310_1, 0x00000043, 0x00000001, nok_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_802460E8_9CB4C8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000F, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246810_9CBBF0, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802414D8_9C68B8, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246884_9CBC64, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241DCC_9C71AC, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241454_9C6834, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241870_9C6C50, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247524_9CC904, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_802417A4_9C6B84, 0x0000000F, 0x00000043, 0x00000001, func_80241858_9C6C38, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802475D4_9CC9B4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000F, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802417D8_9C6BB8, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024188C_9C6C6C, 0x00000043, 0x00000001, func_802416F0_9C6AD0, 0x00000046, 0x00000001, D_80246038_9CB418, 0x00000044, 0x00000001, D_80246380_9CB760, 0x00000043, 0x00000001, nok_01_UnkFunc29, 0x00000043, 0x00000001, nok_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802483B4_9CD794
 .word 0x00000043, 0x00000001, func_80240EA4_9C6284, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, nok_01_UnkFunc31, 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 46a7f96c48..ad0d960428 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
@@ -90,7 +90,7 @@ glabel D_80248758_9DF778
 .word 0x00000045, 0x00000002, D_8024858C_9DF5AC, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_802485CC_9DF5EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248808_9DF828
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_02_Set80151310_1, 0x00000043, 0x00000001, nok_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024726C_9DE28C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80247994_9DE9B4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242080_9D90A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80247A08_9DEA28, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242974_9D9994, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241FFC_9D901C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242418_9D9438, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802486A8_9DF6C8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248758_9DF778, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242434_9D9454, 0x00000043, 0x00000001, func_80242298_9D92B8, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000044, 0x00000001, D_80247504_9DE524, 0x00000043, 0x00000001, nok_02_UnkFunc29, 0x00000043, 0x00000001, nok_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, nok_02_Set80151310_1, 0x00000043, 0x00000001, nok_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024726C_9DE28C, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000013, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80247994_9DE9B4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80242080_9D90A0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80247A08_9DEA28, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80242974_9D9994, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80241FFC_9D901C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80242418_9D9438, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, nok_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_802486A8_9DF6C8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024234C_9D936C, 0x0000000F, 0x00000043, 0x00000001, func_80242400_9D9420, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80248758_9DF778, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000013, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80242380_9D93A0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242434_9D9454, 0x00000043, 0x00000001, func_80242298_9D92B8, 0x00000046, 0x00000001, D_802471BC_9DE1DC, 0x00000044, 0x00000001, D_80247504_9DE524, 0x00000043, 0x00000001, nok_02_UnkFunc29, 0x00000043, 0x00000001, nok_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80249538_9E0558
 .word 0x00000043, 0x00000001, func_80241A4C_9D8A6C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, nok_02_UnkFunc31, 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 d7d22f7469..135a29d8b5 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
@@ -159,7 +159,7 @@ glabel D_80244D28_CFC898
 .word 0x00000045, 0x00000002, D_80244B5C_CFC6CC, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80244B9C_CFC70C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80244DD8_CFC948
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_01_Set80151310_1, 0x00000043, 0x00000001, sam_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024383C_CFB3AC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243F64_CFBAD4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240E70_CF89E0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243FD8_CFBB48, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241764_CF92D4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240DEC_CF895C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241208_CF8D78, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80244C78_CFC7E8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244D28_CFC898, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241224_CF8D94, 0x00000043, 0x00000001, func_80241088_CF8BF8, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000044, 0x00000001, D_80243AD4_CFB644, 0x00000043, 0x00000001, sam_01_UnkFunc29, 0x00000043, 0x00000001, sam_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_01_Set80151310_1, 0x00000043, 0x00000001, sam_01_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024383C_CFB3AC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000E, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80243F64_CFBAD4, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240E70_CF89E0, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80243FD8_CFBB48, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241764_CF92D4, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240DEC_CF895C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241208_CF8D78, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_01_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80244C78_CFC7E8, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802435F4_CFB164, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024113C_CF8CAC, 0x0000000F, 0x00000043, 0x00000001, func_802411F0_CF8D60, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80244D28_CFC898, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000E, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241170_CF8CE0, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241224_CF8D94, 0x00000043, 0x00000001, func_80241088_CF8BF8, 0x00000046, 0x00000001, D_8024378C_CFB2FC, 0x00000044, 0x00000001, D_80243AD4_CFB644, 0x00000043, 0x00000001, sam_01_UnkFunc29, 0x00000043, 0x00000001, sam_01_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80245B08_CFD678
 .word 0x00000043, 0x00000001, func_8024083C_CF83AC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_01_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
index 2aab4633cc..8a2632a147 100644
--- a/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_02/D09AD0.data.s
@@ -141,7 +141,7 @@ glabel D_802481F0_D0D920
 .word 0x00000045, 0x00000002, D_80248024_D0D754, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80248064_D0D794, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802482A0_D0D9D0
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_02_Set80151310_1, 0x00000043, 0x00000001, sam_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80246D04_D0C434, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024742C_D0CB5C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024129C_D069CC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802474A0_D0CBD0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241B90_D072C0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, begin_battle_D06948, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241634_D06D64, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248140_D0D870, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802481F0_D0D920, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241650_D06D80, 0x00000043, 0x00000001, func_802414B4_D06BE4, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000044, 0x00000001, D_80246F9C_D0C6CC, 0x00000043, 0x00000001, sam_02_UnkFunc29, 0x00000043, 0x00000001, sam_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, sam_02_Set80151310_1, 0x00000043, 0x00000001, sam_02_UnkAlphaFunc, 0x00000044, 0x00000001, D_80246D04_D0C434, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_8024742C_D0CB5C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_8024129C_D069CC, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802474A0_D0CBD0, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241B90_D072C0, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, begin_battle_D06948, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_80241568_D06C98, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_80241634_D06D64, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_02_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80248140_D0D870, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246B64_D0C294, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_80241568_D06C98, 0x0000000F, 0x00000043, 0x00000001, func_8024161C_D06D4C, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_802481F0_D0D920, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_8024159C_D06CCC, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80241650_D06D80, 0x00000043, 0x00000001, func_802414B4_D06BE4, 0x00000046, 0x00000001, D_80246C54_D0C384, 0x00000044, 0x00000001, D_80246F9C_D0C6CC, 0x00000043, 0x00000001, sam_02_UnkFunc29, 0x00000043, 0x00000001, sam_02_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80248FD0_D0E700
 .word 0x00000043, 0x00000001, func_80240C68_D06398, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_02_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_09/D369A0.data.s b/ver/us/asm/data/world/area_sam/sam_09/D369A0.data.s
index ffdb1ef671..4b5050a8cc 100644
--- a/ver/us/asm/data/world/area_sam/sam_09/D369A0.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_09/D369A0.data.s
@@ -15,13 +15,13 @@ glabel D_802407DC_D36ACC
 .word 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C84, 0x000001DE, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000082, 0x00000000, 0x0000001E, 0x00000002, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C84, 0x000001EA, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFE363C80, 0x00000000, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000003, 0xFE363C80, 0x00000000, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802409E4_D36CD4
-.word 0x0000000A, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000043, 0x00000001, CloseChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015E, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000003, RemoveItem, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFFFFFE7F, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000011, 0x00000046, 0x00000001, D_80240724_D36A14, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000043, 0x00000002, func_80240118_D36408, 0xFE363C80, 0x00000043, 0x00000002, sam_09_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0160, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240118_D36408, 0xFD050F83, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F83, 0x00000024, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000040, 0x00000024, 0x00000002, 0xFE363C82, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000011, 0x00000046, 0x00000001, D_802407DC_D36ACC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000043, 0x00000001, CloseChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015E, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000003, RemoveItem, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFFFFFE7F, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000011, 0x00000046, 0x00000001, D_80240724_D36A14, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000043, 0x00000002, func_80240118_D36408, 0xFE363C80, 0x00000043, 0x00000002, sam_09_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0160, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240118_D36408, 0xFD050F83, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F83, 0x00000024, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000040, 0x00000024, 0x00000002, 0xFE363C82, 0x00000013, 0x00000024, 0x00000002, 0xFE363C84, 0x00000011, 0x00000046, 0x00000001, D_802407DC_D36ACC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240C80_D36F70
-.word 0x0000000A, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000043, 0x00000001, CloseChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015E, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000003, RemoveItem, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFFFFFFDD, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000015, 0x00000024, 0x00000002, 0xFE363C84, 0x00000013, 0x00000046, 0x00000001, D_80240724_D36A14, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F84, 0x00000043, 0x00000002, func_80240118_D36408, 0xFE363C80, 0x00000043, 0x00000002, sam_09_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFD050F81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0160, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240118_D36408, 0xFD050F84, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F84, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000040, 0x00000024, 0x00000002, 0xFE363C82, 0x00000015, 0x00000024, 0x00000002, 0xFE363C84, 0x00000013, 0x00000046, 0x00000001, D_802407DC_D36ACC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000043, 0x00000001, CloseChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015E, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000003, RemoveItem, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFFFFFFDD, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000015, 0x00000024, 0x00000002, 0xFE363C84, 0x00000013, 0x00000046, 0x00000001, D_80240724_D36A14, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F84, 0x00000043, 0x00000002, func_80240118_D36408, 0xFE363C80, 0x00000043, 0x00000002, sam_09_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFD050F81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0160, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240118_D36408, 0xFD050F84, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F84, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000040, 0x00000024, 0x00000002, 0xFE363C82, 0x00000015, 0x00000024, 0x00000002, 0xFE363C84, 0x00000013, 0x00000046, 0x00000001, D_802407DC_D36ACC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_80240F1C_D3720C
-.word 0x0000000A, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000043, 0x00000001, CloseChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015E, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000003, RemoveItem, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0x00000109, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C84, 0x00000015, 0x00000046, 0x00000001, D_80240724_D36A14, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F85, 0x00000043, 0x00000002, func_80240118_D36408, 0xFE363C80, 0x00000043, 0x00000002, sam_09_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageString, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFD050F82, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0160, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240118_D36408, 0xFD050F85, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F85, 0x00000024, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000040, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C84, 0x00000015, 0x00000046, 0x00000001, D_802407DC_D36ACC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000A, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000043, 0x00000001, CloseChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015E, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000003, RemoveItem, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0x00000109, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C84, 0x00000015, 0x00000046, 0x00000001, D_80240724_D36A14, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F85, 0x00000043, 0x00000002, func_80240118_D36408, 0xFE363C80, 0x00000043, 0x00000002, sam_09_GetItemName, 0xFE363C80, 0x00000043, 0x00000003, SetMessageMsg, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFD050F82, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0160, 0x000000A0, 0x00000028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240118_D36408, 0xFD050F85, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F85, 0x00000024, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000040, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000024, 0x00000002, 0xFE363C84, 0x00000015, 0x00000046, 0x00000001, D_802407DC_D36ACC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802411B8_D374A8
 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFF6A, 0x00000046, 0x00000001, D_802409E4_D36CD4, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000046, 0x00000001, D_80240C80_D36F70, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80240F1C_D3720C, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000011, 0x00000013, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000013, 0x00000015, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000015, 0x00000017, 0x0000000A, 0x00000002, 0xF8406134, 0x00000000, 0x00000024, 0x00000002, 0xF8406134, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000083, 0x00000024, 0x00000002, 0xFD050F81, 0x00000081, 0x00000024, 0x00000002, 0xFD050F82, 0x00000082, 0x00000043, 0x00000001, func_80240158_D36448, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240264_D36554, 0x0000000B, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000013, 0x00000000, 0x00000082, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F80, 0xFFFFFE7F, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F81, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000015, 0x00000000, 0x00000082, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000013, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F81, 0xFFFFFFDD, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F82, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x00000000, 0x00000082, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000015, 0x00000043, 0x00000007, MakeItemEntity, 0xFD050F82, 0x00000109, 0x0000001E, 0xFFFFFFCE, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802403A0_D36690, 0x0000004E, 0x00000006, D_802411B8_D374A8, 0x00000100, 0x00000004, 0xFE363C80, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
index 69ce8020b9..8d05388546 100644
--- a/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
+++ b/ver/us/asm/data/world/area_sam/sam_11/D3D900.data.s
@@ -168,7 +168,7 @@ glabel D_80246608_D40BD8
 .word 0x00000045, 0x00000002, D_8024643C_D40A0C, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_8024647C_D40A4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802466B8_D40C88
-.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, dup_sam_11_Set80151310_1, 0x00000043, 0x00000001, sam_11_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024511C_D3F6EC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245844_D3FE14, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240F40_D3B510, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802458B8_D3FE88, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241834_D3BE04, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240EBC_D3B48C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802412D8_D3B8A8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246558_D40B28, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageString, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageString, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246608_D40BD8, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802412F4_D3B8C4, 0x00000043, 0x00000001, func_80241158_D3B728, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000044, 0x00000001, D_802453B4_D3F984, 0x00000043, 0x00000001, sam_11_UnkFunc29, 0x00000043, 0x00000001, dup_sam_11_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, dup_sam_11_Set80151310_1, 0x00000043, 0x00000001, sam_11_UnkAlphaFunc, 0x00000044, 0x00000001, D_8024511C_D3F6EC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000011, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245844_D3FE14, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_80240F40_D3B510, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_802458B8_D3FE88, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, func_80241834_D3BE04, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, func_80240EBC_D3B48C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, func_802412D8_D3B8A8, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, sam_11_UnkCameraFunc, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246558_D40B28, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244F7C_D3F54C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, func_8024120C_D3B7DC, 0x0000000F, 0x00000043, 0x00000001, func_802412C0_D3B890, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246608_D40BD8, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000011, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80241240_D3B810, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_802412F4_D3B8C4, 0x00000043, 0x00000001, func_80241158_D3B728, 0x00000046, 0x00000001, D_8024506C_D3F63C, 0x00000044, 0x00000001, D_802453B4_D3F984, 0x00000043, 0x00000001, sam_11_UnkFunc29, 0x00000043, 0x00000001, dup_sam_11_Set80151310_0, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802473E8_D419B8
 .word 0x00000043, 0x00000001, func_8024090C_D3AEDC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, sam_11_UnkFunc31, 0x00000002, 0x00000000, 0x00000001, 0x00000000
diff --git a/ver/us/asm/nonmatchings/17D6A0/btl_show_message_popup.s b/ver/us/asm/nonmatchings/17D6A0/btl_show_message_popup.s
index b0f67800d5..f28352d49d 100644
--- a/ver/us/asm/nonmatchings/17D6A0/btl_show_message_popup.s
+++ b/ver/us/asm/nonmatchings/17D6A0/btl_show_message_popup.s
@@ -37,7 +37,7 @@ glabel L80250EEC_17F7CC
 /* 17F7E4 80250F04 3C108028 */  lui       $s0, %hi(bMessages)
 /* 17F7E8 80250F08 02028021 */  addu      $s0, $s0, $v0
 /* 17F7EC 80250F0C 8E103770 */  lw        $s0, %lo(bMessages)($s0)
-/* 17F7F0 80250F10 0C04991D */  jal       get_string_width
+/* 17F7F0 80250F10 0C04991D */  jal       get_msg_width
 /* 17F7F4 80250F14 0200202D */   daddu    $a0, $s0, $zero
 /* 17F7F8 80250F18 2447001E */  addiu     $a3, $v0, 0x1e
 /* 17F7FC 80250F1C 000717C2 */  srl       $v0, $a3, 0x1f
@@ -46,7 +46,7 @@ glabel L80250EEC_17F7CC
 /* 17F808 80250F28 240300A0 */  addiu     $v1, $zero, 0xa0
 /* 17F80C 80250F2C 00628823 */  subu      $s1, $v1, $v0
 /* 17F810 80250F30 00E0902D */  daddu     $s2, $a3, $zero
-/* 17F814 80250F34 0C04992C */  jal       get_string_lines
+/* 17F814 80250F34 0C04992C */  jal       get_msg_lines
 /* 17F818 80250F38 0200202D */   daddu    $a0, $s0, $zero
 /* 17F81C 80250F3C 2442FFFF */  addiu     $v0, $v0, -1
 /* 17F820 80250F40 24040009 */  addiu     $a0, $zero, 9
@@ -79,7 +79,7 @@ glabel L80250F90_17F870
 /* 17F888 80250FA8 3C048028 */  lui       $a0, %hi(bMessages)
 /* 17F88C 80250FAC 00822021 */  addu      $a0, $a0, $v0
 /* 17F890 80250FB0 8C843770 */  lw        $a0, %lo(bMessages)($a0)
-/* 17F894 80250FB4 0C04991D */  jal       get_string_width
+/* 17F894 80250FB4 0C04991D */  jal       get_msg_width
 /* 17F898 80250FB8 0000282D */   daddu    $a1, $zero, $zero
 /* 17F89C 80250FBC 24470037 */  addiu     $a3, $v0, 0x37
 /* 17F8A0 80250FC0 24080028 */  addiu     $t0, $zero, 0x28
@@ -117,7 +117,7 @@ glabel L80251010_17F8F0
 /* 17F91C 8025103C 0C0496FA */  jal       set_message_value
 /* 17F920 80251040 0000282D */   daddu    $a1, $zero, $zero
 /* 17F924 80251044 0000282D */  daddu     $a1, $zero, $zero
-/* 17F928 80251048 0C04991D */  jal       get_string_width
+/* 17F928 80251048 0C04991D */  jal       get_msg_width
 /* 17F92C 8025104C 0200202D */   daddu    $a0, $s0, $zero
 /* 17F930 80251050 2447001F */  addiu     $a3, $v0, 0x1f
 /* 17F934 80251054 000717C2 */  srl       $v0, $a3, 0x1f
@@ -126,7 +126,7 @@ glabel L80251010_17F8F0
 /* 17F940 80251060 240300A0 */  addiu     $v1, $zero, 0xa0
 /* 17F944 80251064 00628823 */  subu      $s1, $v1, $v0
 /* 17F948 80251068 00E0902D */  daddu     $s2, $a3, $zero
-/* 17F94C 8025106C 0C04992C */  jal       get_string_lines
+/* 17F94C 8025106C 0C04992C */  jal       get_msg_lines
 /* 17F950 80251070 0200202D */   daddu    $a0, $s0, $zero
 /* 17F954 80251074 2442FFFF */  addiu     $v0, $v0, -1
 /* 17F958 80251078 24040009 */  addiu     $a0, $zero, 9
@@ -165,10 +165,10 @@ glabel L802510C8_17F9A8
 /* 17F9D8 802510F8 3C108028 */  lui       $s0, %hi(bMessages)
 /* 17F9DC 802510FC 02028021 */  addu      $s0, $s0, $v0
 /* 17F9E0 80251100 8E103770 */  lw        $s0, %lo(bMessages)($s0)
-/* 17F9E4 80251104 0C0496CF */  jal       set_message_string
+/* 17F9E4 80251104 0C0496CF */  jal       set_message_msg
 /* 17F9E8 80251108 0000282D */   daddu    $a1, $zero, $zero
 /* 17F9EC 8025110C 0200202D */  daddu     $a0, $s0, $zero
-/* 17F9F0 80251110 0C04991D */  jal       get_string_width
+/* 17F9F0 80251110 0C04991D */  jal       get_msg_width
 /* 17F9F4 80251114 0000282D */   daddu    $a1, $zero, $zero
 /* 17F9F8 80251118 2447001F */  addiu     $a3, $v0, 0x1f
 /* 17F9FC 8025111C 000717C2 */  srl       $v0, $a3, 0x1f
@@ -177,7 +177,7 @@ glabel L802510C8_17F9A8
 /* 17FA08 80251128 240300A0 */  addiu     $v1, $zero, 0xa0
 /* 17FA0C 8025112C 00628823 */  subu      $s1, $v1, $v0
 /* 17FA10 80251130 00E0902D */  daddu     $s2, $a3, $zero
-/* 17FA14 80251134 0C04992C */  jal       get_string_lines
+/* 17FA14 80251134 0C04992C */  jal       get_msg_lines
 /* 17FA18 80251138 0200202D */   daddu    $a0, $s0, $zero
 /* 17FA1C 8025113C 2442FFFF */  addiu     $v0, $v0, -1
 /* 17FA20 80251140 24040009 */  addiu     $a0, $zero, 9
@@ -211,7 +211,7 @@ glabel L80251190_17FA70
 /* 17FA8C 802511AC 02028021 */  addu      $s0, $s0, $v0
 /* 17FA90 802511B0 8E103770 */  lw        $s0, %lo(bMessages)($s0)
 /* 17FA94 802511B4 241400C0 */  addiu     $s4, $zero, 0xc0
-/* 17FA98 802511B8 0C04991D */  jal       get_string_width
+/* 17FA98 802511B8 0C04991D */  jal       get_msg_width
 /* 17FA9C 802511BC 0200202D */   daddu    $a0, $s0, $zero
 /* 17FAA0 802511C0 2447001F */  addiu     $a3, $v0, 0x1f
 /* 17FAA4 802511C4 000717C2 */  srl       $v0, $a3, 0x1f
@@ -220,7 +220,7 @@ glabel L80251190_17FA70
 /* 17FAB0 802511D0 240300A0 */  addiu     $v1, $zero, 0xa0
 /* 17FAB4 802511D4 00628823 */  subu      $s1, $v1, $v0
 /* 17FAB8 802511D8 00E0902D */  daddu     $s2, $a3, $zero
-/* 17FABC 802511DC 0C04992C */  jal       get_string_lines
+/* 17FABC 802511DC 0C04992C */  jal       get_msg_lines
 /* 17FAC0 802511E0 0200202D */   daddu    $a0, $s0, $zero
 /* 17FAC4 802511E4 2442FFFF */  addiu     $v0, $v0, -1
 /* 17FAC8 802511E8 00021840 */  sll       $v1, $v0, 1
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_80250818.s b/ver/us/asm/nonmatchings/17D6A0/func_80250818.s
index f37680c2f8..6ea53675d4 100644
--- a/ver/us/asm/nonmatchings/17D6A0/func_80250818.s
+++ b/ver/us/asm/nonmatchings/17D6A0/func_80250818.s
@@ -38,7 +38,7 @@ glabel L80250868_17F148
 /* 17F150 80250870 3C108028 */  lui       $s0, %hi(bMessages)
 /* 17F154 80250874 02028021 */  addu      $s0, $s0, $v0
 /* 17F158 80250878 8E103770 */  lw        $s0, %lo(bMessages)($s0)
-/* 17F15C 8025087C 0C04992C */  jal       get_string_lines
+/* 17F15C 8025087C 0C04992C */  jal       get_msg_lines
 /* 17F160 80250880 0200202D */   daddu    $a0, $s0, $zero
 /* 17F164 80250884 2443FFFF */  addiu     $v1, $v0, -1
 /* 17F168 80250888 0200202D */  daddu     $a0, $s0, $zero
@@ -51,7 +51,7 @@ glabel L80250868_17F148
 /* 17F184 802508A4 2402000F */  addiu     $v0, $zero, 0xf
 /* 17F188 802508A8 AFA20010 */  sw        $v0, 0x10($sp)
 /* 17F18C 802508AC AFA00014 */  sw        $zero, 0x14($sp)
-/* 17F190 802508B0 0C04993B */  jal       draw_string
+/* 17F190 802508B0 0C04993B */  jal       draw_msg
 /* 17F194 802508B4 02263021 */   addu     $a2, $s1, $a2
 /* 17F198 802508B8 080943A0 */  j         L80250E80_17F760
 /* 17F19C 802508BC 00000000 */   nop
@@ -61,7 +61,7 @@ glabel L802508C0_17F1A0
 /* 17F1A8 802508C8 3C108028 */  lui       $s0, %hi(bMessages)
 /* 17F1AC 802508CC 02028021 */  addu      $s0, $s0, $v0
 /* 17F1B0 802508D0 8E103770 */  lw        $s0, %lo(bMessages)($s0)
-/* 17F1B4 802508D4 0C04992C */  jal       get_string_lines
+/* 17F1B4 802508D4 0C04992C */  jal       get_msg_lines
 /* 17F1B8 802508D8 0200202D */   daddu    $a0, $s0, $zero
 /* 17F1BC 802508DC 2443FFFF */  addiu     $v1, $v0, -1
 /* 17F1C0 802508E0 0000282D */  daddu     $a1, $zero, $zero
@@ -81,7 +81,7 @@ glabel L8025090C_17F1EC
 /* 17F1F4 80250914 3C108028 */  lui       $s0, %hi(bMessages)
 /* 17F1F8 80250918 02028021 */  addu      $s0, $s0, $v0
 /* 17F1FC 8025091C 8E103770 */  lw        $s0, %lo(bMessages)($s0)
-/* 17F200 80250920 0C04992C */  jal       get_string_lines
+/* 17F200 80250920 0C04992C */  jal       get_msg_lines
 /* 17F204 80250924 0200202D */   daddu    $a0, $s0, $zero
 /* 17F208 80250928 2443FFFF */  addiu     $v1, $v0, -1
 /* 17F20C 8025092C 0000282D */  daddu     $a1, $zero, $zero
@@ -95,7 +95,7 @@ glabel L8025090C_17F1EC
 /* 17F22C 8025094C 3C048028 */  lui       $a0, %hi(bActorMessages)
 /* 17F230 80250950 00822021 */  addu      $a0, $a0, $v0
 /* 17F234 80250954 8C8438C4 */  lw        $a0, %lo(bActorMessages)($a0)
-/* 17F238 80250958 0C0496CF */  jal       set_message_string
+/* 17F238 80250958 0C0496CF */  jal       set_message_msg
 /* 17F23C 8025095C 02238821 */   addu     $s1, $s1, $v1
 /* 17F240 80250960 0200202D */  daddu     $a0, $s0, $zero
 .L80250964:
@@ -104,7 +104,7 @@ glabel L8025090C_17F1EC
 /* 17F24C 8025096C 240700FF */  addiu     $a3, $zero, 0xff
 /* 17F250 80250970 2402000F */  addiu     $v0, $zero, 0xf
 /* 17F254 80250974 AFA20010 */  sw        $v0, 0x10($sp)
-/* 17F258 80250978 0C04993B */  jal       draw_string
+/* 17F258 80250978 0C04993B */  jal       draw_msg
 /* 17F25C 8025097C AFA00014 */   sw       $zero, 0x14($sp)
 /* 17F260 80250980 080943A0 */  j         L80250E80_17F760
 /* 17F264 80250984 00000000 */   nop
@@ -120,7 +120,7 @@ glabel L80250988_17F268
 /* 17F288 802509A8 2402000F */  addiu     $v0, $zero, 0xf
 /* 17F28C 802509AC AFA20010 */  sw        $v0, 0x10($sp)
 /* 17F290 802509B0 AFA00014 */  sw        $zero, 0x14($sp)
-/* 17F294 802509B4 0C04993B */  jal       draw_string
+/* 17F294 802509B4 0C04993B */  jal       draw_msg
 /* 17F298 802509B8 0200202D */   daddu    $a0, $s0, $zero
 /* 17F29C 802509BC 2645000D */  addiu     $a1, $s2, 0xd
 /* 17F2A0 802509C0 3C10802A */  lui       $s0, %hi(D_8029F642)
@@ -148,7 +148,7 @@ glabel L802509DC_17F2BC
 /* 17F2EC 80250A0C 02028021 */  addu      $s0, $s0, $v0
 /* 17F2F0 80250A10 8E103770 */  lw        $s0, %lo(bMessages)($s0)
 /* 17F2F4 80250A14 2631FFFA */  addiu     $s1, $s1, -6
-/* 17F2F8 80250A18 0C04992C */  jal       get_string_lines
+/* 17F2F8 80250A18 0C04992C */  jal       get_msg_lines
 /* 17F2FC 80250A1C 0200202D */   daddu    $a0, $s0, $zero
 /* 17F300 80250A20 2443FFFF */  addiu     $v1, $v0, -1
 /* 17F304 80250A24 0200202D */  daddu     $a0, $s0, $zero
@@ -162,7 +162,7 @@ glabel L802509DC_17F2BC
 /* 17F324 80250A44 AFA20010 */  sw        $v0, 0x10($sp)
 /* 17F328 80250A48 AFA00014 */  sw        $zero, 0x14($sp)
 /* 17F32C 80250A4C 02238821 */  addu      $s1, $s1, $v1
-/* 17F330 80250A50 0C04993B */  jal       draw_string
+/* 17F330 80250A50 0C04993B */  jal       draw_msg
 /* 17F334 80250A54 26260006 */   addiu    $a2, $s1, 6
 /* 17F338 80250A58 96620012 */  lhu       $v0, 0x12($s3)
 /* 17F33C 80250A5C 2442FFD2 */  addiu     $v0, $v0, -0x2e
diff --git a/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s b/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s
index 2464f451fc..c1968f990b 100644
--- a/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s
+++ b/ver/us/asm/nonmatchings/18C790/btl_state_update_celebration.s
@@ -1826,7 +1826,7 @@ glabel L8025FC04_18E4E4
 glabel L8025FCA4_18E584
 /* 18E584 8025FCA4 3C04001D */  lui       $a0, 0x1d
 /* 18E588 8025FCA8 348400AB */  ori       $a0, $a0, 0xab
-/* 18E58C 8025FCAC 0C04991D */  jal       get_string_width
+/* 18E58C 8025FCAC 0C04991D */  jal       get_msg_width
 /* 18E590 8025FCB0 0000282D */   daddu    $a1, $zero, $zero
 /* 18E594 8025FCB4 24040009 */  addiu     $a0, $zero, 9
 /* 18E598 8025FCB8 2447001F */  addiu     $a3, $v0, 0x1f
diff --git a/ver/us/asm/nonmatchings/18C790/func_80260948.s b/ver/us/asm/nonmatchings/18C790/func_80260948.s
index 472ba28d28..d716590d25 100644
--- a/ver/us/asm/nonmatchings/18C790/func_80260948.s
+++ b/ver/us/asm/nonmatchings/18C790/func_80260948.s
@@ -56,7 +56,7 @@ glabel func_80260948
 /* 18F2E0 80260A00 24A50011 */  addiu     $a1, $a1, 0x11
 /* 18F2E4 80260A04 240700FF */  addiu     $a3, $zero, 0xff
 /* 18F2E8 80260A08 AFA20010 */  sw        $v0, 0x10($sp)
-/* 18F2EC 80260A0C 0C04993B */  jal       draw_string
+/* 18F2EC 80260A0C 0C04993B */  jal       draw_msg
 /* 18F2F0 80260A10 AFA00014 */   sw       $zero, 0x14($sp)
 .L80260A14:
 /* 18F2F4 80260A14 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message.s b/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message.s
index 9de3d322ad..1239ee9f86 100644
--- a/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message.s
+++ b/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message.s
@@ -18,7 +18,7 @@ glabel draw_merlee_message
 /* 21304 80045F04 02028021 */  addu      $s0, $s0, $v0
 /* 21308 80045F08 8E108168 */  lw        $s0, %lo(D_80078168)($s0)
 /* 2130C 80045F0C 0000282D */  daddu     $a1, $zero, $zero
-/* 21310 80045F10 0C04991D */  jal       get_string_width
+/* 21310 80045F10 0C04991D */  jal       get_msg_width
 /* 21314 80045F14 0200202D */   daddu    $a0, $s0, $zero
 /* 21318 80045F18 0200202D */  daddu     $a0, $s0, $zero
 /* 2131C 80045F1C 2451001E */  addiu     $s1, $v0, 0x1e
@@ -26,7 +26,7 @@ glabel draw_merlee_message
 /* 21324 80045F24 02221021 */  addu      $v0, $s1, $v0
 /* 21328 80045F28 00021043 */  sra       $v0, $v0, 1
 /* 2132C 80045F2C 241000A0 */  addiu     $s0, $zero, 0xa0
-/* 21330 80045F30 0C04992C */  jal       get_string_lines
+/* 21330 80045F30 0C04992C */  jal       get_msg_lines
 /* 21334 80045F34 02028023 */   subu     $s0, $s0, $v0
 /* 21338 80045F38 24040009 */  addiu     $a0, $zero, 9
 /* 2133C 80045F3C 2442FFFF */  addiu     $v0, $v0, -1
diff --git a/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message_string.s b/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message_string.s
index f8c2916e69..4bbcc7e822 100644
--- a/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message_string.s
+++ b/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message_string.s
@@ -14,7 +14,7 @@ glabel draw_merlee_message_string
 /* 21270 80045E70 02429021 */  addu      $s2, $s2, $v0
 /* 21274 80045E74 8E528168 */  lw        $s2, %lo(D_80078168)($s2)
 /* 21278 80045E78 24B1000F */  addiu     $s1, $a1, 0xf
-/* 2127C 80045E7C 0C04992C */  jal       get_string_lines
+/* 2127C 80045E7C 0C04992C */  jal       get_msg_lines
 /* 21280 80045E80 0240202D */   daddu    $a0, $s2, $zero
 /* 21284 80045E84 0240202D */  daddu     $a0, $s2, $zero
 /* 21288 80045E88 2442FFFF */  addiu     $v0, $v0, -1
@@ -27,7 +27,7 @@ glabel draw_merlee_message_string
 /* 212A4 80045EA4 240700FF */  addiu     $a3, $zero, 0xff
 /* 212A8 80045EA8 AFA20010 */  sw        $v0, 0x10($sp)
 /* 212AC 80045EAC AFA00014 */  sw        $zero, 0x14($sp)
-/* 212B0 80045EB0 0C04993B */  jal       draw_string
+/* 212B0 80045EB0 0C04993B */  jal       draw_msg
 /* 212B4 80045EB4 02063021 */   addu     $a2, $s0, $a2
 /* 212B8 80045EB8 8FBF0024 */  lw        $ra, 0x24($sp)
 /* 212BC 80045EBC 8FB20020 */  lw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/415D90/btl_draw_menu_wheel.s b/ver/us/asm/nonmatchings/415D90/btl_draw_menu_wheel.s
index 7a1553b123..3a8a7da57f 100644
--- a/ver/us/asm/nonmatchings/415D90/btl_draw_menu_wheel.s
+++ b/ver/us/asm/nonmatchings/415D90/btl_draw_menu_wheel.s
@@ -613,7 +613,7 @@ glabel L802A1DB4_416B44
 /* 4172E0 802A2550 3C04802B */  lui       $a0, %hi(battle_menu_messageIDs)
 /* 4172E4 802A2554 00832021 */  addu      $a0, $a0, $v1
 /* 4172E8 802A2558 8C84D090 */  lw        $a0, %lo(battle_menu_messageIDs)($a0)
-/* 4172EC 802A255C 0C04993B */  jal       draw_string
+/* 4172EC 802A255C 0C04993B */  jal       draw_msg
 /* 4172F0 802A2560 02A0382D */   daddu    $a3, $s5, $zero
 .L802A2564:
 /* 4172F4 802A2564 3C04800E */  lui       $a0, %hi(gBattleStatus)
diff --git a/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s b/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s
index 6164ef2b9a..fcba4fb9e4 100644
--- a/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s
+++ b/ver/us/asm/nonmatchings/415D90/btl_state_draw_select_target.s
@@ -283,7 +283,7 @@ glabel btl_state_draw_select_target
 .L802AB0EC:
 /* 41FE7C 802AB0EC 348400C5 */  ori       $a0, $a0, 0xc5
 .L802AB0F0:
-/* 41FE80 802AB0F0 0C04991D */  jal       get_string_width
+/* 41FE80 802AB0F0 0C04991D */  jal       get_msg_width
 /* 41FE84 802AB0F4 0000282D */   daddu    $a1, $zero, $zero
 /* 41FE88 802AB0F8 2442000A */  addiu     $v0, $v0, 0xa
 /* 41FE8C 802AB0FC 0000202D */  daddu     $a0, $zero, $zero
@@ -420,7 +420,7 @@ glabel btl_state_draw_select_target
 .L802AB2E8:
 /* 420078 802AB2E8 01052821 */  addu      $a1, $t0, $a1
 .L802AB2EC:
-/* 42007C 802AB2EC 0C04993B */  jal       draw_string
+/* 42007C 802AB2EC 0C04993B */  jal       draw_msg
 /* 420080 802AB2F0 00000000 */   nop
 .L802AB2F4:
 /* 420084 802AB2F4 8FBF008C */  lw        $ra, 0x8c($sp)
diff --git a/ver/us/asm/nonmatchings/415D90/func_802A2C84.s b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s
index c5eb4819bf..2d89bb758e 100644
--- a/ver/us/asm/nonmatchings/415D90/func_802A2C84.s
+++ b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s
@@ -1016,7 +1016,7 @@ glabel L802A3A9C_41882C
 /* 4188A8 802A3B18 3631009F */  ori       $s1, $s1, 0x9f
 .L802A3B1C:
 /* 4188AC 802A3B1C 0220202D */  daddu     $a0, $s1, $zero
-/* 4188B0 802A3B20 0C04991D */  jal       get_string_width
+/* 4188B0 802A3B20 0C04991D */  jal       get_msg_width
 /* 4188B4 802A3B24 0000282D */   daddu    $a1, $zero, $zero
 /* 4188B8 802A3B28 24500017 */  addiu     $s0, $v0, 0x17
 /* 4188BC 802A3B2C 001017C2 */  srl       $v0, $s0, 0x1f
@@ -1024,7 +1024,7 @@ glabel L802A3A9C_41882C
 /* 4188C4 802A3B34 00021043 */  sra       $v0, $v0, 1
 /* 4188C8 802A3B38 240300A0 */  addiu     $v1, $zero, 0xa0
 /* 4188CC 802A3B3C 00629823 */  subu      $s3, $v1, $v0
-/* 4188D0 802A3B40 0C04992C */  jal       get_string_lines
+/* 4188D0 802A3B40 0C04992C */  jal       get_msg_lines
 /* 4188D4 802A3B44 0220202D */   daddu    $a0, $s1, $zero
 /* 4188D8 802A3B48 24040009 */  addiu     $a0, $zero, 9
 /* 4188DC 802A3B4C 0260282D */  daddu     $a1, $s3, $zero
diff --git a/ver/us/asm/nonmatchings/415D90/func_802A3C98.s b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s
index c42ebd2a3d..d22d54339f 100644
--- a/ver/us/asm/nonmatchings/415D90/func_802A3C98.s
+++ b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s
@@ -181,7 +181,7 @@ glabel L802A3D00_418A90
 /* 418CBC 802A3F2C AFA80010 */  sw        $t0, 0x10($sp)
 /* 418CC0 802A3F30 AFA20014 */  sw        $v0, 0x14($sp)
 /* 418CC4 802A3F34 8C840000 */  lw        $a0, ($a0)
-/* 418CC8 802A3F38 0C04993B */  jal       draw_string
+/* 418CC8 802A3F38 0C04993B */  jal       draw_msg
 /* 418CCC 802A3F3C 0220302D */   daddu    $a2, $s1, $zero
 .L802A3F40:
 /* 418CD0 802A3F40 8E820000 */  lw        $v0, ($s4)
diff --git a/ver/us/asm/nonmatchings/415D90/func_802A4A54.s b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s
index a75d58cd34..76b7575c64 100644
--- a/ver/us/asm/nonmatchings/415D90/func_802A4A54.s
+++ b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s
@@ -493,7 +493,7 @@ glabel L802A5130_419EC0
 .L802A516C:
 /* 419EFC 802A516C 348400CC */  ori       $a0, $a0, 0xcc
 .L802A5170:
-/* 419F00 802A5170 0C04991D */  jal       get_string_width
+/* 419F00 802A5170 0C04991D */  jal       get_msg_width
 /* 419F04 802A5174 0000282D */   daddu    $a1, $zero, $zero
 /* 419F08 802A5178 24040009 */  addiu     $a0, $zero, 9
 /* 419F0C 802A517C 24470017 */  addiu     $a3, $v0, 0x17
diff --git a/ver/us/asm/nonmatchings/415D90/func_802A5290.s b/ver/us/asm/nonmatchings/415D90/func_802A5290.s
index d3b267f5e2..afda2bdd13 100644
--- a/ver/us/asm/nonmatchings/415D90/func_802A5290.s
+++ b/ver/us/asm/nonmatchings/415D90/func_802A5290.s
@@ -172,7 +172,7 @@ glabel L802A52F8_41A088
 /* 41A28C 802A54FC 8C440000 */  lw        $a0, ($v0)
 /* 41A290 802A5500 3C07802B */  lui       $a3, %hi(D_802AD624)
 /* 41A294 802A5504 8CE7D624 */  lw        $a3, %lo(D_802AD624)($a3)
-/* 41A298 802A5508 0C04993B */  jal       draw_string
+/* 41A298 802A5508 0C04993B */  jal       draw_msg
 /* 41A29C 802A550C 26940004 */   addiu    $s4, $s4, 4
 /* 41A2A0 802A5510 3C02802B */  lui       $v0, %hi(D_802AD66C)
 /* 41A2A4 802A5514 8C42D66C */  lw        $v0, %lo(D_802AD66C)($v0)
diff --git a/ver/us/asm/nonmatchings/415D90/func_802A57C8.s b/ver/us/asm/nonmatchings/415D90/func_802A57C8.s
index 8580bc89ac..83927f7fd1 100644
--- a/ver/us/asm/nonmatchings/415D90/func_802A57C8.s
+++ b/ver/us/asm/nonmatchings/415D90/func_802A57C8.s
@@ -19,7 +19,7 @@ glabel func_802A57C8
 /* 41A588 802A57F8 2402000F */  addiu     $v0, $zero, 0xf
 /* 41A58C 802A57FC 240700FF */  addiu     $a3, $zero, 0xff
 /* 41A590 802A5800 AFA20010 */  sw        $v0, 0x10($sp)
-/* 41A594 802A5804 0C04993B */  jal       draw_string
+/* 41A594 802A5804 0C04993B */  jal       draw_msg
 /* 41A598 802A5808 AFA00014 */   sw       $zero, 0x14($sp)
 /* 41A59C 802A580C 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 41A5A0 802A5810 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F48F4.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F48F4.s
index 63917a59ef..8ba232684c 100644
--- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F48F4.s
+++ b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F48F4.s
@@ -17,7 +17,7 @@ glabel func_800F48F4
 /* 8DDD4 800F4924 00021080 */  sll       $v0, $v0, 2
 /* 8DDD8 800F4928 00621821 */  addu      $v1, $v1, $v0
 /* 8DDDC 800F492C 8C640294 */  lw        $a0, 0x294($v1)
-/* 8DDE0 800F4930 0C04993B */  jal       draw_string
+/* 8DDE0 800F4930 0C04993B */  jal       draw_msg
 /* 8DDE4 800F4934 24A50008 */   addiu    $a1, $a1, 8
 /* 8DDE8 800F4938 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 8DDEC 800F493C 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s
index 552203759c..42d0366b79 100644
--- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s
+++ b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s
@@ -32,7 +32,7 @@ glabel func_800F4944
 glabel L800F4994_8DE44
 /* 8DE44 800F4994 3C04001D */  lui       $a0, 0x1d
 /* 8DE48 800F4998 34840061 */  ori       $a0, $a0, 0x61
-/* 8DE4C 800F499C 0C04991D */  jal       get_string_width
+/* 8DE4C 800F499C 0C04991D */  jal       get_msg_width
 /* 8DE50 800F49A0 0000282D */   daddu    $a1, $zero, $zero
 /* 8DE54 800F49A4 3C04001D */  lui       $a0, 0x1d
 /* 8DE58 800F49A8 0803D2F7 */  j         .L800F4BDC
@@ -40,7 +40,7 @@ glabel L800F4994_8DE44
 glabel L800F49B0_8DE60
 /* 8DE60 800F49B0 3C04001D */  lui       $a0, 0x1d
 /* 8DE64 800F49B4 34840063 */  ori       $a0, $a0, 0x63
-/* 8DE68 800F49B8 0C04991D */  jal       get_string_width
+/* 8DE68 800F49B8 0C04991D */  jal       get_msg_width
 /* 8DE6C 800F49BC 0000282D */   daddu    $a1, $zero, $zero
 /* 8DE70 800F49C0 3C04001D */  lui       $a0, 0x1d
 /* 8DE74 800F49C4 34840063 */  ori       $a0, $a0, 0x63
@@ -54,7 +54,7 @@ glabel L800F49B0_8DE60
 glabel L800F49E4_8DE94
 /* 8DE94 800F49E4 3C04001D */  lui       $a0, 0x1d
 /* 8DE98 800F49E8 34840064 */  ori       $a0, $a0, 0x64
-/* 8DE9C 800F49EC 0C04991D */  jal       get_string_width
+/* 8DE9C 800F49EC 0C04991D */  jal       get_msg_width
 /* 8DEA0 800F49F0 0000282D */   daddu    $a1, $zero, $zero
 /* 8DEA4 800F49F4 3C04001D */  lui       $a0, 0x1d
 /* 8DEA8 800F49F8 34840064 */  ori       $a0, $a0, 0x64
@@ -68,7 +68,7 @@ glabel L800F49E4_8DE94
 glabel L800F4A18_8DEC8
 /* 8DEC8 800F4A18 3C04001D */  lui       $a0, 0x1d
 /* 8DECC 800F4A1C 34840070 */  ori       $a0, $a0, 0x70
-/* 8DED0 800F4A20 0C04991D */  jal       get_string_width
+/* 8DED0 800F4A20 0C04991D */  jal       get_msg_width
 /* 8DED4 800F4A24 0000282D */   daddu    $a1, $zero, $zero
 /* 8DED8 800F4A28 3C04001D */  lui       $a0, 0x1d
 /* 8DEDC 800F4A2C 34840070 */  ori       $a0, $a0, 0x70
@@ -82,7 +82,7 @@ glabel L800F4A18_8DEC8
 glabel L800F4A4C_8DEFC
 /* 8DEFC 800F4A4C 3C04001D */  lui       $a0, 0x1d
 /* 8DF00 800F4A50 3484006A */  ori       $a0, $a0, 0x6a
-/* 8DF04 800F4A54 0C04991D */  jal       get_string_width
+/* 8DF04 800F4A54 0C04991D */  jal       get_msg_width
 /* 8DF08 800F4A58 0000282D */   daddu    $a1, $zero, $zero
 /* 8DF0C 800F4A5C 3C04001D */  lui       $a0, 0x1d
 /* 8DF10 800F4A60 3484006A */  ori       $a0, $a0, 0x6a
@@ -96,7 +96,7 @@ glabel L800F4A4C_8DEFC
 glabel L800F4A80_8DF30
 /* 8DF30 800F4A80 3C04001D */  lui       $a0, 0x1d
 /* 8DF34 800F4A84 34840065 */  ori       $a0, $a0, 0x65
-/* 8DF38 800F4A88 0C04991D */  jal       get_string_width
+/* 8DF38 800F4A88 0C04991D */  jal       get_msg_width
 /* 8DF3C 800F4A8C 0000282D */   daddu    $a1, $zero, $zero
 /* 8DF40 800F4A90 3C04001D */  lui       $a0, 0x1d
 /* 8DF44 800F4A94 34840065 */  ori       $a0, $a0, 0x65
@@ -105,7 +105,7 @@ glabel L800F4A80_8DF30
 glabel L800F4AA0_8DF50
 /* 8DF50 800F4AA0 3C04001D */  lui       $a0, 0x1d
 /* 8DF54 800F4AA4 34840066 */  ori       $a0, $a0, 0x66
-/* 8DF58 800F4AA8 0C04991D */  jal       get_string_width
+/* 8DF58 800F4AA8 0C04991D */  jal       get_msg_width
 /* 8DF5C 800F4AAC 0000282D */   daddu    $a1, $zero, $zero
 /* 8DF60 800F4AB0 3C04001D */  lui       $a0, 0x1d
 /* 8DF64 800F4AB4 0803D2F7 */  j         .L800F4BDC
@@ -113,7 +113,7 @@ glabel L800F4AA0_8DF50
 glabel L800F4ABC_8DF6C
 /* 8DF6C 800F4ABC 3C04001D */  lui       $a0, 0x1d
 /* 8DF70 800F4AC0 34840067 */  ori       $a0, $a0, 0x67
-/* 8DF74 800F4AC4 0C04991D */  jal       get_string_width
+/* 8DF74 800F4AC4 0C04991D */  jal       get_msg_width
 /* 8DF78 800F4AC8 0000282D */   daddu    $a1, $zero, $zero
 /* 8DF7C 800F4ACC 3C04001D */  lui       $a0, 0x1d
 /* 8DF80 800F4AD0 0803D2F7 */  j         .L800F4BDC
@@ -121,7 +121,7 @@ glabel L800F4ABC_8DF6C
 glabel L800F4AD8_8DF88
 /* 8DF88 800F4AD8 3C04001D */  lui       $a0, 0x1d
 /* 8DF8C 800F4ADC 3484006F */  ori       $a0, $a0, 0x6f
-/* 8DF90 800F4AE0 0C04991D */  jal       get_string_width
+/* 8DF90 800F4AE0 0C04991D */  jal       get_msg_width
 /* 8DF94 800F4AE4 0000282D */   daddu    $a1, $zero, $zero
 /* 8DF98 800F4AE8 3C04001D */  lui       $a0, 0x1d
 /* 8DF9C 800F4AEC 3484006F */  ori       $a0, $a0, 0x6f
@@ -135,7 +135,7 @@ glabel L800F4AD8_8DF88
 glabel L800F4B0C_8DFBC
 /* 8DFBC 800F4B0C 3C04001D */  lui       $a0, 0x1d
 /* 8DFC0 800F4B10 3484006D */  ori       $a0, $a0, 0x6d
-/* 8DFC4 800F4B14 0C04991D */  jal       get_string_width
+/* 8DFC4 800F4B14 0C04991D */  jal       get_msg_width
 /* 8DFC8 800F4B18 0000282D */   daddu    $a1, $zero, $zero
 /* 8DFCC 800F4B1C 3C04001D */  lui       $a0, 0x1d
 /* 8DFD0 800F4B20 3484006D */  ori       $a0, $a0, 0x6d
@@ -149,7 +149,7 @@ glabel L800F4B0C_8DFBC
 glabel L800F4B40_8DFF0
 /* 8DFF0 800F4B40 3C04001D */  lui       $a0, 0x1d
 /* 8DFF4 800F4B44 348400D6 */  ori       $a0, $a0, 0xd6
-/* 8DFF8 800F4B48 0C04991D */  jal       get_string_width
+/* 8DFF8 800F4B48 0C04991D */  jal       get_msg_width
 /* 8DFFC 800F4B4C 0000282D */   daddu    $a1, $zero, $zero
 /* 8E000 800F4B50 3C04001D */  lui       $a0, 0x1d
 /* 8E004 800F4B54 0803D2F7 */  j         .L800F4BDC
@@ -157,7 +157,7 @@ glabel L800F4B40_8DFF0
 glabel L800F4B5C_8E00C
 /* 8E00C 800F4B5C 3C04001D */  lui       $a0, 0x1d
 /* 8E010 800F4B60 3484006C */  ori       $a0, $a0, 0x6c
-/* 8E014 800F4B64 0C04991D */  jal       get_string_width
+/* 8E014 800F4B64 0C04991D */  jal       get_msg_width
 /* 8E018 800F4B68 0000282D */   daddu    $a1, $zero, $zero
 /* 8E01C 800F4B6C 3C04001D */  lui       $a0, 0x1d
 /* 8E020 800F4B70 3484006C */  ori       $a0, $a0, 0x6c
@@ -171,7 +171,7 @@ glabel L800F4B5C_8E00C
 glabel L800F4B90_8E040
 /* 8E040 800F4B90 3C04001D */  lui       $a0, 0x1d
 /* 8E044 800F4B94 3484006D */  ori       $a0, $a0, 0x6d
-/* 8E048 800F4B98 0C04991D */  jal       get_string_width
+/* 8E048 800F4B98 0C04991D */  jal       get_msg_width
 /* 8E04C 800F4B9C 0000282D */   daddu    $a1, $zero, $zero
 /* 8E050 800F4BA0 3C04001D */  lui       $a0, 0x1d
 /* 8E054 800F4BA4 3484006D */  ori       $a0, $a0, 0x6d
@@ -185,7 +185,7 @@ glabel L800F4B90_8E040
 glabel L800F4BC4_8E074
 /* 8E074 800F4BC4 3C04001D */  lui       $a0, 0x1d
 /* 8E078 800F4BC8 34840062 */  ori       $a0, $a0, 0x62
-/* 8E07C 800F4BCC 0C04991D */  jal       get_string_width
+/* 8E07C 800F4BCC 0C04991D */  jal       get_msg_width
 /* 8E080 800F4BD0 0000282D */   daddu    $a1, $zero, $zero
 /* 8E084 800F4BD4 3C04001D */  lui       $a0, 0x1d
 /* 8E088 800F4BD8 34840062 */  ori       $a0, $a0, 0x62
@@ -201,7 +201,7 @@ glabel L800F4BC4_8E074
 /* 8E0A4 800F4BF4 240700FF */  addiu     $a3, $zero, 0xff
 /* 8E0A8 800F4BF8 2402000F */  addiu     $v0, $zero, 0xf
 /* 8E0AC 800F4BFC AFA20010 */  sw        $v0, 0x10($sp)
-/* 8E0B0 800F4C00 0C04993B */  jal       draw_string
+/* 8E0B0 800F4C00 0C04993B */  jal       draw_msg
 /* 8E0B4 800F4C04 AFA00014 */   sw       $zero, 0x14($sp)
 .L800F4C08:
 /* 8E0B8 800F4C08 8FBF0020 */  lw        $ra, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4C1C.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4C1C.s
index 93b5a2d548..a47fe82afe 100644
--- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4C1C.s
+++ b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4C1C.s
@@ -18,7 +18,7 @@ glabel func_800F4C1C
 /* 8E0FC 800F4C4C 2402000F */  addiu     $v0, $zero, 0xf
 /* 8E100 800F4C50 240700FF */  addiu     $a3, $zero, 0xff
 /* 8E104 800F4C54 AFA20010 */  sw        $v0, 0x10($sp)
-/* 8E108 800F4C58 0C04993B */  jal       draw_string
+/* 8E108 800F4C58 0C04993B */  jal       draw_msg
 /* 8E10C 800F4C5C AFA00014 */   sw       $zero, 0x14($sp)
 /* 8E110 800F4C60 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 8E114 800F4C64 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4CF0.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4CF0.s
index 616746d888..2c39b6087d 100644
--- a/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4CF0.s
+++ b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4CF0.s
@@ -11,7 +11,7 @@ glabel func_800F4CF0
 /* 8E1B8 800F4D08 240700FF */  addiu     $a3, $zero, 0xff
 /* 8E1BC 800F4D0C AFBF0018 */  sw        $ra, 0x18($sp)
 /* 8E1C0 800F4D10 AFA20010 */  sw        $v0, 0x10($sp)
-/* 8E1C4 800F4D14 0C04993B */  jal       draw_string
+/* 8E1C4 800F4D14 0C04993B */  jal       draw_msg
 /* 8E1C8 800F4D18 AFA00014 */   sw       $zero, 0x14($sp)
 /* 8E1CC 800F4D1C 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 8E1D0 800F4D20 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s
index c4381f30f7..d374af94a5 100644
--- a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s
+++ b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_menu_contents.s
@@ -521,7 +521,7 @@ glabel L800F3D94_8D244
 /* 8D27C 800F3DCC AFB00010 */  sw        $s0, 0x10($sp)
 /* 8D280 800F3DD0 AFAA0014 */  sw        $t2, 0x14($sp)
 .L800F3DD4:
-/* 8D284 800F3DD4 0C04993B */  jal       draw_string
+/* 8D284 800F3DD4 0C04993B */  jal       draw_msg
 /* 8D288 800F3DD8 00000000 */   nop
 .L800F3DDC:
 /* 8D28C 800F3DDC 3C048011 */  lui       $a0, %hi(D_8010D69C)
diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_title_contents.s b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_title_contents.s
index e8fd0b2d77..5105099caa 100644
--- a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_title_contents.s
+++ b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_draw_title_contents.s
@@ -68,7 +68,7 @@ glabel L800F4694_8DB44
 /* 8DBC8 800F4718 8E070000 */  lw        $a3, ($s0)
 /* 8DBCC 800F471C 24110032 */  addiu     $s1, $zero, 0x32
 /* 8DBD0 800F4720 AFB10010 */  sw        $s1, 0x10($sp)
-/* 8DBD4 800F4724 0C04993B */  jal       draw_string
+/* 8DBD4 800F4724 0C04993B */  jal       draw_msg
 /* 8DBD8 800F4728 AFA80014 */   sw       $t0, 0x14($sp)
 /* 8DBDC 800F472C 2685005E */  addiu     $a1, $s4, 0x5e
 /* 8DBE0 800F4730 0240302D */  daddu     $a2, $s2, $zero
@@ -93,7 +93,7 @@ glabel L800F4694_8DB44
 /* 8DC28 800F4778 8E070000 */  lw        $a3, ($s0)
 /* 8DC2C 800F477C 24110032 */  addiu     $s1, $zero, 0x32
 /* 8DC30 800F4780 AFB10010 */  sw        $s1, 0x10($sp)
-/* 8DC34 800F4784 0C04993B */  jal       draw_string
+/* 8DC34 800F4784 0C04993B */  jal       draw_msg
 /* 8DC38 800F4788 AFA80014 */   sw       $t0, 0x14($sp)
 /* 8DC3C 800F478C 2685005E */  addiu     $a1, $s4, 0x5e
 /* 8DC40 800F4790 0240302D */  daddu     $a2, $s2, $zero
@@ -185,7 +185,7 @@ glabel L800F48A4_8DD54
 /* 8DD74 800F48C4 24020001 */  addiu     $v0, $zero, 1
 /* 8DD78 800F48C8 AFA20014 */  sw        $v0, 0x14($sp)
 .L800F48CC:
-/* 8DD7C 800F48CC 0C04993B */  jal       draw_string
+/* 8DD7C 800F48CC 0C04993B */  jal       draw_msg
 /* 8DD80 800F48D0 00000000 */   nop
 .L800F48D4:
 /* 8DD84 800F48D4 8FBF0034 */  lw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_update.s b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_update.s
index e04c71d5b9..55f66311a3 100644
--- a/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_update.s
+++ b/ver/us/asm/nonmatchings/8a860_len_3f30/popup_menu_update.s
@@ -1575,7 +1575,7 @@ glabel L800F3034_8C4E4
 .L800F3064:
 /* 8C514 800F3064 3C04001D */  lui       $a0, 0x1d
 /* 8C518 800F3068 3484006B */  ori       $a0, $a0, 0x6b
-/* 8C51C 800F306C 0C04991D */  jal       get_string_width
+/* 8C51C 800F306C 0C04991D */  jal       get_msg_width
 /* 8C520 800F3070 0000282D */   daddu    $a1, $zero, $zero
 /* 8C524 800F3074 24470017 */  addiu     $a3, $v0, 0x17
 /* 8C528 800F3078 24040009 */  addiu     $a0, $zero, 9
@@ -1790,7 +1790,7 @@ glabel L800F3350_8C800
 /* 8C830 800F3380 3C04001D */  lui       $a0, 0x1d
 /* 8C834 800F3384 34840068 */  ori       $a0, $a0, 0x68
 .L800F3388:
-/* 8C838 800F3388 0C04991D */  jal       get_string_width
+/* 8C838 800F3388 0C04991D */  jal       get_msg_width
 /* 8C83C 800F338C 0000282D */   daddu    $a1, $zero, $zero
 /* 8C840 800F3390 24470017 */  addiu     $a3, $v0, 0x17
 /* 8C844 800F3394 24040015 */  addiu     $a0, $zero, 0x15
@@ -1817,7 +1817,7 @@ glabel L800F3350_8C800
 /* 8C898 800F33E8 3C04001E */  lui       $a0, 0x1e
 /* 8C89C 800F33EC 3C058011 */  lui       $a1, %hi(D_8010D6A4)
 /* 8C8A0 800F33F0 24A5D6A4 */  addiu     $a1, $a1, %lo(D_8010D6A4)
-/* 8C8A4 800F33F4 0C049640 */  jal       msg_get_printer_for_string
+/* 8C8A4 800F33F4 0C049640 */  jal       msg_get_printer_for_msg
 /* 8C8A8 800F33F8 3484001D */   ori      $a0, $a0, 0x1d
 /* 8C8AC 800F33FC 0040202D */  daddu     $a0, $v0, $zero
 /* 8C8B0 800F3400 240500A0 */  addiu     $a1, $zero, 0xa0
diff --git a/ver/us/asm/nonmatchings/C50A0/func_801363A0.s b/ver/us/asm/nonmatchings/C50A0/func_801363A0.s
index 615ae90d7b..78790b1a43 100644
--- a/ver/us/asm/nonmatchings/C50A0/func_801363A0.s
+++ b/ver/us/asm/nonmatchings/C50A0/func_801363A0.s
@@ -65,7 +65,7 @@ glabel func_801363A0
 /* CCB78 80136478 3652005C */  ori       $s2, $s2, 0x5c
 .L8013647C:
 /* CCB7C 8013647C 8C840000 */  lw        $a0, ($a0)
-/* CCB80 80136480 0C0496CF */  jal       set_message_string
+/* CCB80 80136480 0C0496CF */  jal       set_message_msg
 /* CCB84 80136484 0000282D */   daddu    $a1, $zero, $zero
 /* CCB88 80136488 86840018 */  lh        $a0, 0x18($s4)
 /* CCB8C 8013648C 00041140 */  sll       $v0, $a0, 5
@@ -84,14 +84,14 @@ glabel func_801363A0
 /* CCBC0 801364C0 30420030 */  andi      $v0, $v0, 0x30
 /* CCBC4 801364C4 14400006 */  bnez      $v0, .L801364E0
 /* CCBC8 801364C8 00000000 */   nop
-/* CCBCC 801364CC 0C04991D */  jal       get_string_width
+/* CCBCC 801364CC 0C04991D */  jal       get_msg_width
 /* CCBD0 801364D0 0000282D */   daddu    $a1, $zero, $zero
 /* CCBD4 801364D4 0804D93B */  j         .L801364EC
 /* CCBD8 801364D8 24500036 */   addiu    $s0, $v0, 0x36
 .L801364DC:
 /* CCBDC 801364DC 0240202D */  daddu     $a0, $s2, $zero
 .L801364E0:
-/* CCBE0 801364E0 0C04991D */  jal       get_string_width
+/* CCBE0 801364E0 0C04991D */  jal       get_msg_width
 /* CCBE4 801364E4 0000282D */   daddu    $a1, $zero, $zero
 /* CCBE8 801364E8 2450001E */  addiu     $s0, $v0, 0x1e
 .L801364EC:
@@ -133,10 +133,10 @@ glabel func_801363A0
 .L80136564:
 /* CCC64 80136564 8C840000 */  lw        $a0, ($a0)
 /* CCC68 80136568 0000282D */  daddu     $a1, $zero, $zero
-/* CCC6C 8013656C 0C0496CF */  jal       set_message_string
+/* CCC6C 8013656C 0C0496CF */  jal       set_message_msg
 /* CCC70 80136570 2413004C */   addiu    $s3, $zero, 0x4c
 /* CCC74 80136574 0240202D */  daddu     $a0, $s2, $zero
-/* CCC78 80136578 0C04991D */  jal       get_string_width
+/* CCC78 80136578 0C04991D */  jal       get_msg_width
 /* CCC7C 8013657C 0000282D */   daddu    $a1, $zero, $zero
 /* CCC80 80136580 2450001E */  addiu     $s0, $v0, 0x1e
 /* CCC84 80136584 001017C2 */  srl       $v0, $s0, 0x1f
@@ -145,7 +145,7 @@ glabel func_801363A0
 /* CCC90 80136590 240300A0 */  addiu     $v1, $zero, 0xa0
 /* CCC94 80136594 00628823 */  subu      $s1, $v1, $v0
 .L80136598:
-/* CCC98 80136598 0C04992C */  jal       get_string_lines
+/* CCC98 80136598 0C04992C */  jal       get_msg_lines
 /* CCC9C 8013659C 0240202D */   daddu    $a0, $s2, $zero
 /* CCCA0 801365A0 2442FFFF */  addiu     $v0, $v0, -1
 /* CCCA4 801365A4 00021040 */  sll       $v0, $v0, 1
@@ -202,7 +202,7 @@ glabel func_801363A0
 /* CCD68 80136668 1062002C */  beq       $v1, $v0, .L8013671C
 /* CCD6C 8013666C 3C04001D */   lui      $a0, 0x1d
 /* CCD70 80136670 34840060 */  ori       $a0, $a0, 0x60
-/* CCD74 80136674 0C04991D */  jal       get_string_width
+/* CCD74 80136674 0C04991D */  jal       get_msg_width
 /* CCD78 80136678 0000282D */   daddu    $a1, $zero, $zero
 /* CCD7C 8013667C 24500018 */  addiu     $s0, $v0, 0x18
 /* CCD80 80136680 24040011 */  addiu     $a0, $zero, 0x11
@@ -220,11 +220,11 @@ glabel func_801363A0
 /* CCDB0 801366B0 0200382D */   daddu    $a3, $s0, $zero
 .L801366B4:
 /* CCDB4 801366B4 8C840000 */  lw        $a0, ($a0)
-/* CCDB8 801366B8 0C0496CF */  jal       set_message_string
+/* CCDB8 801366B8 0C0496CF */  jal       set_message_msg
 /* CCDBC 801366BC 0000282D */   daddu    $a1, $zero, $zero
 /* CCDC0 801366C0 3C04001D */  lui       $a0, 0x1d
 /* CCDC4 801366C4 3484005F */  ori       $a0, $a0, 0x5f
-/* CCDC8 801366C8 0C04991D */  jal       get_string_width
+/* CCDC8 801366C8 0C04991D */  jal       get_msg_width
 /* CCDCC 801366CC 0000282D */   daddu    $a1, $zero, $zero
 /* CCDD0 801366D0 24500036 */  addiu     $s0, $v0, 0x36
 /* CCDD4 801366D4 2404000C */  addiu     $a0, $zero, 0xc
diff --git a/ver/us/asm/nonmatchings/C50A0/func_8013673C.s b/ver/us/asm/nonmatchings/C50A0/func_8013673C.s
index d42b645a9c..b6ba41f1b1 100644
--- a/ver/us/asm/nonmatchings/C50A0/func_8013673C.s
+++ b/ver/us/asm/nonmatchings/C50A0/func_8013673C.s
@@ -52,7 +52,7 @@ glabel L801367A4_CCEA4
 /* CCED4 801367D4 36100058 */  ori       $s0, $s0, 0x58
 .L801367D8:
 /* CCED8 801367D8 8C840000 */  lw        $a0, ($a0)
-/* CCEDC 801367DC 0C0496CF */  jal       set_message_string
+/* CCEDC 801367DC 0C0496CF */  jal       set_message_msg
 /* CCEE0 801367E0 0000282D */   daddu    $a1, $zero, $zero
 /* CCEE4 801367E4 96230006 */  lhu       $v1, 6($s1)
 /* CCEE8 801367E8 30620010 */  andi      $v0, $v1, 0x10
@@ -101,10 +101,10 @@ glabel L801367A4_CCEA4
 /* CCF78 80136878 3610005C */  ori       $s0, $s0, 0x5c
 .L8013687C:
 /* CCF7C 8013687C 8C840000 */  lw        $a0, ($a0)
-/* CCF80 80136880 0C0496CF */  jal       set_message_string
+/* CCF80 80136880 0C0496CF */  jal       set_message_msg
 /* CCF84 80136884 0000282D */   daddu    $a1, $zero, $zero
 .L80136888:
-/* CCF88 80136888 0C04992C */  jal       get_string_lines
+/* CCF88 80136888 0C04992C */  jal       get_msg_lines
 /* CCF8C 8013688C 0200202D */   daddu    $a0, $s0, $zero
 /* CCF90 80136890 2442FFFF */  addiu     $v0, $v0, -1
 /* CCF94 80136894 86250018 */  lh        $a1, 0x18($s1)
@@ -139,7 +139,7 @@ glabel L801367A4_CCEA4
 /* CD000 80136900 240700FF */  addiu     $a3, $zero, 0xff
 /* CD004 80136904 2402002F */  addiu     $v0, $zero, 0x2f
 /* CD008 80136908 AFA20010 */  sw        $v0, 0x10($sp)
-/* CD00C 8013690C 0C04993B */  jal       draw_string
+/* CD00C 8013690C 0C04993B */  jal       draw_msg
 /* CD010 80136910 AFA00014 */   sw       $zero, 0x14($sp)
 /* CD014 80136914 0804DA6D */  j         L801369B4_CD0B4
 /* CD018 80136918 00000000 */   nop
@@ -148,7 +148,7 @@ glabel L801367A4_CCEA4
 /* CD020 80136920 240700FF */  addiu     $a3, $zero, 0xff
 /* CD024 80136924 2402002F */  addiu     $v0, $zero, 0x2f
 /* CD028 80136928 AFA20010 */  sw        $v0, 0x10($sp)
-/* CD02C 8013692C 0C04993B */  jal       draw_string
+/* CD02C 8013692C 0C04993B */  jal       draw_msg
 /* CD030 80136930 AFA00014 */   sw       $zero, 0x14($sp)
 /* CD034 80136934 96220006 */  lhu       $v0, 6($s1)
 /* CD038 80136938 30420030 */  andi      $v0, $v0, 0x30
@@ -163,7 +163,7 @@ glabel L8013694C_CD04C
 /* CD058 80136958 3C048008 */  lui       $a0, %hi(gItemTable)
 /* CD05C 8013695C 00822021 */  addu      $a0, $a0, $v0
 /* CD060 80136960 8C8478E0 */  lw        $a0, %lo(gItemTable)($a0)
-/* CD064 80136964 0C0496CF */  jal       set_message_string
+/* CD064 80136964 0C0496CF */  jal       set_message_msg
 /* CD068 80136968 0000282D */   daddu    $a1, $zero, $zero
 /* CD06C 8013696C 3C04001D */  lui       $a0, 0x1d
 /* CD070 80136970 3484005F */  ori       $a0, $a0, 0x5f
@@ -172,7 +172,7 @@ glabel L8013694C_CD04C
 /* CD07C 8013697C 240700FF */  addiu     $a3, $zero, 0xff
 /* CD080 80136980 2402002F */  addiu     $v0, $zero, 0x2f
 /* CD084 80136984 AFA20010 */  sw        $v0, 0x10($sp)
-/* CD088 80136988 0C04993B */  jal       draw_string
+/* CD088 80136988 0C04993B */  jal       draw_msg
 /* CD08C 8013698C AFA00014 */   sw       $zero, 0x14($sp)
 /* CD090 80136990 26450014 */  addiu     $a1, $s2, 0x14
 .L80136994:
diff --git a/ver/us/asm/nonmatchings/C50A0/func_801369D0.s b/ver/us/asm/nonmatchings/C50A0/func_801369D0.s
index 41c2be53ef..49ccb9302b 100644
--- a/ver/us/asm/nonmatchings/C50A0/func_801369D0.s
+++ b/ver/us/asm/nonmatchings/C50A0/func_801369D0.s
@@ -11,7 +11,7 @@ glabel func_801369D0
 /* CD0E8 801369E8 240700FF */  addiu     $a3, $zero, 0xff
 /* CD0EC 801369EC AFBF0018 */  sw        $ra, 0x18($sp)
 /* CD0F0 801369F0 AFA20010 */  sw        $v0, 0x10($sp)
-/* CD0F4 801369F4 0C04993B */  jal       draw_string
+/* CD0F4 801369F4 0C04993B */  jal       draw_msg
 /* CD0F8 801369F8 AFA00014 */   sw       $zero, 0x14($sp)
 /* CD0FC 801369FC 8FBF0018 */  lw        $ra, 0x18($sp)
 /* CD100 80136A00 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/C50A0/func_80136A08.s b/ver/us/asm/nonmatchings/C50A0/func_80136A08.s
index 5041ac3765..d8a510c98b 100644
--- a/ver/us/asm/nonmatchings/C50A0/func_80136A08.s
+++ b/ver/us/asm/nonmatchings/C50A0/func_80136A08.s
@@ -25,7 +25,7 @@ glabel func_80136A08
 /* CD154 80136A54 8C640014 */  lw        $a0, 0x14($v1)
 /* CD158 80136A58 240700FF */  addiu     $a3, $zero, 0xff
 /* CD15C 80136A5C AFA20010 */  sw        $v0, 0x10($sp)
-/* CD160 80136A60 0C04993B */  jal       draw_string
+/* CD160 80136A60 0C04993B */  jal       draw_msg
 /* CD164 80136A64 AFA00014 */   sw       $zero, 0x14($sp)
 .L80136A68:
 /* CD168 80136A68 8FBF0018 */  lw        $ra, 0x18($sp)
diff --git a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s
index b2e5711d13..65775a3602 100644
--- a/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s
+++ b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s
@@ -599,7 +599,7 @@ glabel L80135F08_CC608
 .L80135F44:
 /* CC644 80135F44 3C058015 */  lui       $a1, %hi(D_801568F8)
 /* CC648 80135F48 24A568F8 */  addiu     $a1, $a1, %lo(D_801568F8)
-/* CC64C 80135F4C 0C049640 */  jal       msg_get_printer_for_string
+/* CC64C 80135F4C 0C049640 */  jal       msg_get_printer_for_msg
 /* CC650 80135F50 00000000 */   nop
 /* CC654 80135F54 0040202D */  daddu     $a0, $v0, $zero
 /* CC658 80135F58 0000282D */  daddu     $a1, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/evt/msg_api/_show_message.s b/ver/us/asm/nonmatchings/evt/msg_api/_show_message.s
index e9ddd2ee0e..00b520c5f3 100644
--- a/ver/us/asm/nonmatchings/evt/msg_api/_show_message.s
+++ b/ver/us/asm/nonmatchings/evt/msg_api/_show_message.s
@@ -105,7 +105,7 @@ glabel _show_message
 /* F4E30 802D0480 0240202D */   daddu    $a0, $s2, $zero
 /* F4E34 802D0484 3C05802E */  lui       $a1, %hi(gCurrentPrintContext)
 /* F4E38 802D0488 8CA5B260 */  lw        $a1, %lo(gCurrentPrintContext)($a1)
-/* F4E3C 802D048C 0C04969A */  jal       msg_printer_load_string
+/* F4E3C 802D048C 0C04969A */  jal       msg_printer_load_msg
 /* F4E40 802D0490 0040202D */   daddu    $a0, $v0, $zero
 /* F4E44 802D0494 080B413A */  j         .L802D04E8
 /* F4E48 802D0498 2402FFFE */   addiu    $v0, $zero, -2
@@ -125,7 +125,7 @@ glabel _show_message
 /* F4E7C 802D04CC 0040A82D */  daddu     $s5, $v0, $zero
 /* F4E80 802D04D0 0200202D */  daddu     $a0, $s0, $zero
 .L802D04D4:
-/* F4E84 802D04D4 0C049640 */  jal       msg_get_printer_for_string
+/* F4E84 802D04D4 0C049640 */  jal       msg_get_printer_for_msg
 /* F4E88 802D04D8 02C0282D */   daddu    $a1, $s6, $zero
 /* F4E8C 802D04DC 3C01802E */  lui       $at, %hi(gCurrentPrintContext)
 /* F4E90 802D04E0 AC22B260 */  sw        $v0, %lo(gCurrentPrintContext)($at)
diff --git a/ver/us/asm/nonmatchings/msg/_msg_get_printer_for_string.s b/ver/us/asm/nonmatchings/msg/_msg_get_printer_for_msg.s
similarity index 97%
rename from ver/us/asm/nonmatchings/msg/_msg_get_printer_for_string.s
rename to ver/us/asm/nonmatchings/msg/_msg_get_printer_for_msg.s
index 12757f1b7d..8d5f22f2a3 100644
--- a/ver/us/asm/nonmatchings/msg/_msg_get_printer_for_string.s
+++ b/ver/us/asm/nonmatchings/msg/_msg_get_printer_for_msg.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel _msg_get_printer_for_string
+glabel _msg_get_printer_for_msg
 /* BC01C 8012591C 27BDFFA0 */  addiu     $sp, $sp, -0x60
 /* BC020 80125920 AFB70054 */  sw        $s7, 0x54($sp)
 /* BC024 80125924 0080B82D */  daddu     $s7, $a0, $zero
@@ -54,7 +54,7 @@ glabel _msg_get_printer_for_string
 /* BC0D8 801259D8 AFB50010 */  sw        $s5, 0x10($sp)
 /* BC0DC 801259DC AFB60014 */  sw        $s6, 0x14($sp)
 /* BC0E0 801259E0 AFA00018 */  sw        $zero, 0x18($sp)
-/* BC0E4 801259E4 0C0497DA */  jal       get_string_properties
+/* BC0E4 801259E4 0C0497DA */  jal       get_msg_properties
 /* BC0E8 801259E8 AFA0001C */   sw       $zero, 0x1c($sp)
 /* BC0EC 801259EC 96220002 */  lhu       $v0, 2($s1)
 /* BC0F0 801259F0 A6020536 */  sh        $v0, 0x536($s0)
diff --git a/ver/us/asm/nonmatchings/msg/draw_string.s b/ver/us/asm/nonmatchings/msg/draw_msg.s
similarity index 98%
rename from ver/us/asm/nonmatchings/msg/draw_string.s
rename to ver/us/asm/nonmatchings/msg/draw_msg.s
index 6cef18542c..b3da7bbad7 100644
--- a/ver/us/asm/nonmatchings/msg/draw_string.s
+++ b/ver/us/asm/nonmatchings/msg/draw_msg.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel draw_string
+glabel draw_msg
 /* BCBEC 801264EC 27BDFA58 */  addiu     $sp, $sp, -0x5a8
 /* BCBF0 801264F0 8FA205BC */  lw        $v0, 0x5bc($sp)
 /* BCBF4 801264F4 AFB7059C */  sw        $s7, 0x59c($sp)
@@ -48,7 +48,7 @@ glabel draw_string
 /* BCC8C 8012658C 24040400 */   addiu    $a0, $zero, 0x400
 /* BCC90 80126590 0040A02D */  daddu     $s4, $v0, $zero
 /* BCC94 80126594 0200202D */  daddu     $a0, $s0, $zero
-/* BCC98 80126598 0C049601 */  jal       dma_load_string
+/* BCC98 80126598 0C049601 */  jal       dma_load_msg
 /* BCC9C 8012659C 0280282D */   daddu    $a1, $s4, $zero
 /* BCCA0 801265A0 0000282D */  daddu     $a1, $zero, $zero
 /* BCCA4 801265A4 27B00578 */  addiu     $s0, $sp, 0x578
@@ -59,7 +59,7 @@ glabel draw_string
 /* BCCB8 801265B8 AFA00018 */  sw        $zero, 0x18($sp)
 /* BCCBC 801265BC AFB3001C */  sw        $s3, 0x1c($sp)
 /* BCCC0 801265C0 0280202D */  daddu     $a0, $s4, $zero
-/* BCCC4 801265C4 0C0497DA */  jal       get_string_properties
+/* BCCC4 801265C4 0C0497DA */  jal       get_msg_properties
 /* BCCC8 801265C8 00A0382D */   daddu    $a3, $a1, $zero
 /* BCCCC 801265CC 96020002 */  lhu       $v0, 2($s0)
 /* BCCD0 801265D0 A7A20558 */  sh        $v0, 0x558($sp)
diff --git a/ver/us/asm/nonmatchings/msg/get_string_properties.s b/ver/us/asm/nonmatchings/msg/get_msg_properties.s
similarity index 98%
rename from ver/us/asm/nonmatchings/msg/get_string_properties.s
rename to ver/us/asm/nonmatchings/msg/get_msg_properties.s
index 03614e08e2..1f0d7cc1ea 100644
--- a/ver/us/asm/nonmatchings/msg/get_string_properties.s
+++ b/ver/us/asm/nonmatchings/msg/get_msg_properties.s
@@ -17,7 +17,7 @@ glabel jtbl_801506B8
 
 .section .text
 
-glabel get_string_properties
+glabel get_msg_properties
 /* BC668 80125F68 27BDFEB0 */  addiu     $sp, $sp, -0x150
 /* BC66C 80125F6C F7B40148 */  sdc1      $f20, 0x148($sp)
 /* BC670 80125F70 3C013F80 */  lui       $at, 0x3f80
@@ -53,7 +53,7 @@ glabel get_string_properties
 /* BC6E8 80125FE8 24040400 */   addiu    $a0, $zero, 0x400
 /* BC6EC 80125FEC 0200202D */  daddu     $a0, $s0, $zero
 /* BC6F0 80125FF0 AFA200F0 */  sw        $v0, 0xf0($sp)
-/* BC6F4 80125FF4 0C049601 */  jal       dma_load_string
+/* BC6F4 80125FF4 0C049601 */  jal       dma_load_msg
 /* BC6F8 80125FF8 0040282D */   daddu    $a1, $v0, $zero
 /* BC6FC 80125FFC 8FB100F0 */  lw        $s1, 0xf0($sp)
 /* BC700 80126000 08049803 */  j         .L8012600C
@@ -240,10 +240,10 @@ glabel L80126268_BC968
 /* BC96C 8012626C 26100001 */  addiu     $s0, $s0, 1
 /* BC970 80126270 90440000 */  lbu       $a0, ($v0)
 /* BC974 80126274 0000282D */  daddu     $a1, $zero, $zero
-/* BC978 80126278 3C098015 */  lui       $t1, %hi(gMessageStringVars)
-/* BC97C 8012627C 25295C38 */  addiu     $t1, $t1, %lo(gMessageStringVars)
+/* BC978 80126278 3C098015 */  lui       $t1, %hi(gMessageMsgVars)
+/* BC97C 8012627C 25295C38 */  addiu     $t1, $t1, %lo(gMessageMsgVars)
 /* BC980 80126280 00042140 */  sll       $a0, $a0, 5
-/* BC984 80126284 0C04991D */  jal       get_string_width
+/* BC984 80126284 0C04991D */  jal       get_msg_width
 /* BC988 80126288 00892021 */   addu     $a0, $a0, $t1
 /* BC98C 8012628C 080498BA */  j         L801262E8_BC9E8
 /* BC990 80126290 02629821 */   addu     $s3, $s3, $v0
diff --git a/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s b/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s
index 3aedeafcc0..cfe9547bf6 100644
--- a/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s
+++ b/ver/us/asm/nonmatchings/msg/msg_copy_to_print_buffer.s
@@ -936,8 +936,8 @@ glabel L80125244_BB944
 /* BB96C 8012526C 27A60010 */  addiu     $a2, $sp, 0x10
 .L80125270:
 /* BB970 80125270 96820528 */  lhu       $v0, 0x528($s4)
-/* BB974 80125274 3C088015 */  lui       $t0, %hi(gMessageStringVars)
-/* BB978 80125278 25085C38 */  addiu     $t0, $t0, %lo(gMessageStringVars)
+/* BB974 80125274 3C088015 */  lui       $t0, %hi(gMessageMsgVars)
+/* BB978 80125278 25085C38 */  addiu     $t0, $t0, %lo(gMessageMsgVars)
 /* BB97C 8012527C 24430001 */  addiu     $v1, $v0, 1
 /* BB980 80125280 3042FFFF */  andi      $v0, $v0, 0xffff
 /* BB984 80125284 00501021 */  addu      $v0, $v0, $s0
@@ -959,8 +959,8 @@ glabel L80125244_BB944
 /* BB9C4 801252C4 00400008 */  jr        $v0
 /* BB9C8 801252C8 00000000 */   nop
 /* BB9CC 801252CC 96820528 */  lhu       $v0, 0x528($s4)
-/* BB9D0 801252D0 3C088015 */  lui       $t0, %hi(gMessageStringVars)
-/* BB9D4 801252D4 25085C38 */  addiu     $t0, $t0, %lo(gMessageStringVars)
+/* BB9D0 801252D0 3C088015 */  lui       $t0, %hi(gMessageMsgVars)
+/* BB9D4 801252D4 25085C38 */  addiu     $t0, $t0, %lo(gMessageMsgVars)
 /* BB9D8 801252D8 00501021 */  addu      $v0, $v0, $s0
 /* BB9DC 801252DC 00481021 */  addu      $v0, $v0, $t0
 /* BB9E0 801252E0 90420000 */  lbu       $v0, ($v0)
@@ -982,8 +982,8 @@ glabel L80125244_BB944
 /* BBA1C 8012531C A3A20010 */   sb       $v0, 0x10($sp)
 /* BBA20 80125320 A3B60010 */  sb        $s6, 0x10($sp)
 /* BBA24 80125324 96820528 */  lhu       $v0, 0x528($s4)
-/* BBA28 80125328 3C088015 */  lui       $t0, %hi(gMessageStringVars)
-/* BBA2C 8012532C 25085C38 */  addiu     $t0, $t0, %lo(gMessageStringVars)
+/* BBA28 80125328 3C088015 */  lui       $t0, %hi(gMessageMsgVars)
+/* BBA2C 8012532C 25085C38 */  addiu     $t0, $t0, %lo(gMessageMsgVars)
 /* BBA30 80125330 24430001 */  addiu     $v1, $v0, 1
 /* BBA34 80125334 3042FFFF */  andi      $v0, $v0, 0xffff
 /* BBA38 80125338 00501021 */  addu      $v0, $v0, $s0
@@ -1009,8 +1009,8 @@ glabel L80125244_BB944
 /* BBA80 80125380 24020004 */  addiu     $v0, $zero, 4
 /* BBA84 80125384 A3A20011 */  sb        $v0, 0x11($sp)
 /* BBA88 80125388 96820528 */  lhu       $v0, 0x528($s4)
-/* BBA8C 8012538C 3C088015 */  lui       $t0, %hi(gMessageStringVars)
-/* BBA90 80125390 25085C38 */  addiu     $t0, $t0, %lo(gMessageStringVars)
+/* BBA8C 8012538C 3C088015 */  lui       $t0, %hi(gMessageMsgVars)
+/* BBA90 80125390 25085C38 */  addiu     $t0, $t0, %lo(gMessageMsgVars)
 /* BBA94 80125394 24430001 */  addiu     $v1, $v0, 1
 /* BBA98 80125398 3042FFFF */  andi      $v0, $v0, 0xffff
 /* BBA9C 8012539C 00501021 */  addu      $v0, $v0, $s0
@@ -1047,8 +1047,8 @@ glabel L80125244_BB944
 /* BBAFC 801253FC 26520001 */   addiu    $s2, $s2, 1
 .L80125400:
 /* BBB00 80125400 96820528 */  lhu       $v0, 0x528($s4)
-/* BBB04 80125404 3C088015 */  lui       $t0, %hi(gMessageStringVars)
-/* BBB08 80125408 25085C38 */  addiu     $t0, $t0, %lo(gMessageStringVars)
+/* BBB04 80125404 3C088015 */  lui       $t0, %hi(gMessageMsgVars)
+/* BBB08 80125408 25085C38 */  addiu     $t0, $t0, %lo(gMessageMsgVars)
 /* BBB0C 8012540C 00501021 */  addu      $v0, $v0, $s0
 /* BBB10 80125410 00481021 */  addu      $v0, $v0, $t0
 /* BBB14 80125414 90420000 */  lbu       $v0, ($v0)
diff --git a/ver/us/asm/nonmatchings/msg/set_message_string.s b/ver/us/asm/nonmatchings/msg/set_message_msg.s
similarity index 91%
rename from ver/us/asm/nonmatchings/msg/set_message_string.s
rename to ver/us/asm/nonmatchings/msg/set_message_msg.s
index c2b5369505..68a81a813a 100644
--- a/ver/us/asm/nonmatchings/msg/set_message_string.s
+++ b/ver/us/asm/nonmatchings/msg/set_message_msg.s
@@ -1,7 +1,7 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel set_message_string
+glabel set_message_msg
 /* BC23C 80125B3C 27BDFFE0 */  addiu     $sp, $sp, -0x20
 /* BC240 80125B40 AFB00010 */  sw        $s0, 0x10($sp)
 /* BC244 80125B44 0080802D */  daddu     $s0, $a0, $zero
@@ -15,14 +15,14 @@ glabel set_message_string
 /* BC264 80125B64 24040400 */   addiu    $a0, $zero, 0x400
 /* BC268 80125B68 0040882D */  daddu     $s1, $v0, $zero
 /* BC26C 80125B6C 0200202D */  daddu     $a0, $s0, $zero
-/* BC270 80125B70 0C049601 */  jal       dma_load_string
+/* BC270 80125B70 0C049601 */  jal       dma_load_msg
 /* BC274 80125B74 0220282D */   daddu    $a1, $s1, $zero
 /* BC278 80125B78 0220802D */  daddu     $s0, $s1, $zero
 .L80125B7C:
 /* BC27C 80125B7C 0000282D */  daddu     $a1, $zero, $zero
 /* BC280 80125B80 240600FD */  addiu     $a2, $zero, 0xfd
-/* BC284 80125B84 3C038015 */  lui       $v1, %hi(gMessageStringVars)
-/* BC288 80125B88 24635C38 */  addiu     $v1, $v1, %lo(gMessageStringVars)
+/* BC284 80125B84 3C038015 */  lui       $v1, %hi(gMessageMsgVars)
+/* BC288 80125B88 24635C38 */  addiu     $v1, $v1, %lo(gMessageMsgVars)
 /* BC28C 80125B8C 00121140 */  sll       $v0, $s2, 5
 /* BC290 80125B90 00432021 */  addu      $a0, $v0, $v1
 .L80125B94:
diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s
index e0799ced8e..0fdb4baeeb 100644
--- a/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s
+++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s
@@ -12,8 +12,8 @@ glabel pause_handle_input
 /* 137780 80244440 804200D4 */  lb        $v0, %lo(gPauseMenuCurrentTab)($v0)
 /* 137784 80244444 3C05F840 */  lui       $a1, 0xf840
 /* 137788 80244448 AFB3003C */  sw        $s3, 0x3c($sp)
-/* 13778C 8024444C 3C138027 */  lui       $s3, %hi(gPauseMenuCurrentDescString)
-/* 137790 80244450 8E7300C8 */  lw        $s3, %lo(gPauseMenuCurrentDescString)($s3)
+/* 13778C 8024444C 3C138027 */  lui       $s3, %hi(gPauseMenuCurrentDescMsg)
+/* 137790 80244450 8E7300C8 */  lw        $s3, %lo(gPauseMenuCurrentDescMsg)($s3)
 /* 137794 80244454 AFBF004C */  sw        $ra, 0x4c($sp)
 /* 137798 80244458 AFB40040 */  sw        $s4, 0x40($sp)
 /* 13779C 8024445C AFB20038 */  sw        $s2, 0x38($sp)
@@ -105,7 +105,7 @@ glabel pause_handle_input
 /* 1378DC 8024459C AFA20010 */  sw        $v0, 0x10($sp)
 /* 1378E0 802445A0 AFA00014 */  sw        $zero, 0x14($sp)
 /* 1378E4 802445A4 AFA00018 */  sw        $zero, 0x18($sp)
-/* 1378E8 802445A8 0C0497DA */  jal       get_string_properties
+/* 1378E8 802445A8 0C0497DA */  jal       get_msg_properties
 /* 1378EC 802445AC AFA0001C */   sw       $zero, 0x1c($sp)
 /* 1378F0 802445B0 8FA3002C */  lw        $v1, 0x2c($sp)
 /* 1378F4 802445B4 30620001 */  andi      $v0, $v1, 1
diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s
index fabae8748d..7d4988e93d 100644
--- a/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s
+++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s
@@ -62,8 +62,8 @@ glabel pause_init
 /* 13747C 8024413C AC20010C */  sw        $zero, %lo(D_8027010C)($at)
 /* 137480 80244140 3C018027 */  lui       $at, %hi(D_80270118)
 /* 137484 80244144 AC200118 */  sw        $zero, %lo(D_80270118)($at)
-/* 137488 80244148 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13748C 8024414C AC2000C8 */  sw        $zero, %lo(gPauseMenuCurrentDescString)($at)
+/* 137488 80244148 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13748C 8024414C AC2000C8 */  sw        $zero, %lo(gPauseMenuCurrentDescMsg)($at)
 /* 137490 80244150 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescIconScript)
 /* 137494 80244154 AC2000CC */  sw        $zero, %lo(gPauseMenuCurrentDescIconScript)($at)
 /* 137498 80244158 3C018027 */  lui       $at, %hi(gPauseMenuCurrentTab)
diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s
index 41d67ddff8..a6eb83789d 100644
--- a/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s
+++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s
@@ -121,7 +121,7 @@ glabel pause_textbox_draw_contents
 /* 136A78 80243738 AD020004 */  sw        $v0, 4($t0)
 /* 136A7C 8024373C 2402000A */  addiu     $v0, $zero, 0xa
 /* 136A80 80243740 AFA20010 */  sw        $v0, 0x10($sp)
-/* 136A84 80243744 0C04993B */  jal       draw_string
+/* 136A84 80243744 0C04993B */  jal       draw_msg
 /* 136A88 80243748 AFA00014 */   sw       $zero, 0x14($sp)
 /* 136A8C 8024374C 3C128027 */  lui       $s2, %hi(D_80270118)
 /* 136A90 80243750 26520118 */  addiu     $s2, $s2, %lo(D_80270118)
diff --git a/ver/us/asm/nonmatchings/pause/135EE0/pause_tutorial_draw_contents.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_tutorial_draw_contents.s
index c98a96dba7..140b8031ae 100644
--- a/ver/us/asm/nonmatchings/pause/135EE0/pause_tutorial_draw_contents.s
+++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_tutorial_draw_contents.s
@@ -296,7 +296,7 @@ glabel pause_tutorial_draw_contents
 /* 136FAC 80243C6C AC640000 */  sw        $a0, ($v1)
 /* 136FB0 80243C70 1440FF8E */  bnez      $v0, .L80243AAC
 /* 136FB4 80243C74 AC6F0004 */   sw       $t7, 4($v1)
-/* 136FB8 80243C78 0C093BA0 */  jal       pause_get_menu_string
+/* 136FB8 80243C78 0C093BA0 */  jal       pause_get_menu_msg
 /* 136FBC 80243C7C 24040001 */   addiu    $a0, $zero, 1
 /* 136FC0 80243C80 0040202D */  daddu     $a0, $v0, $zero
 /* 136FC4 80243C84 27A500A8 */  addiu     $a1, $sp, 0xa8
@@ -308,13 +308,13 @@ glabel pause_tutorial_draw_contents
 /* 136FDC 80243C9C 24140001 */  addiu     $s4, $zero, 1
 /* 136FE0 80243CA0 AFA20014 */  sw        $v0, 0x14($sp)
 /* 136FE4 80243CA4 AFA00018 */  sw        $zero, 0x18($sp)
-/* 136FE8 80243CA8 0C0497DA */  jal       get_string_properties
+/* 136FE8 80243CA8 0C0497DA */  jal       get_msg_properties
 /* 136FEC 80243CAC AFB4001C */   sw       $s4, 0x1c($sp)
 /* 136FF0 80243CB0 8FB000AC */  lw        $s0, 0xac($sp)
 /* 136FF4 80243CB4 8FAE012C */  lw        $t6, 0x12c($sp)
 /* 136FF8 80243CB8 0280202D */  daddu     $a0, $s4, $zero
 /* 136FFC 80243CBC 01D08023 */  subu      $s0, $t6, $s0
-/* 137000 80243CC0 0C093BA0 */  jal       pause_get_menu_string
+/* 137000 80243CC0 0C093BA0 */  jal       pause_get_menu_msg
 /* 137004 80243CC4 02908007 */   srav     $s0, $s0, $s4
 /* 137008 80243CC8 0040202D */  daddu     $a0, $v0, $zero
 /* 13700C 80243CCC 8FAF0124 */  lw        $t7, 0x124($sp)
@@ -322,7 +322,7 @@ glabel pause_tutorial_draw_contents
 /* 137014 80243CD4 240700FF */  addiu     $a3, $zero, 0xff
 /* 137018 80243CD8 AFA00010 */  sw        $zero, 0x10($sp)
 /* 13701C 80243CDC AFB40014 */  sw        $s4, 0x14($sp)
-/* 137020 80243CE0 0C04993B */  jal       draw_string
+/* 137020 80243CE0 0C04993B */  jal       draw_msg
 /* 137024 80243CE4 01F02821 */   addu     $a1, $t7, $s0
 /* 137028 80243CE8 3C158025 */  lui       $s5, %hi(D_8024F018)
 /* 13702C 80243CEC 26B5F018 */  addiu     $s5, $s5, %lo(D_8024F018)
@@ -409,7 +409,7 @@ glabel pause_tutorial_draw_contents
 /* 137170 80243E30 8E240000 */  lw        $a0, ($s1)
 /* 137174 80243E34 00621821 */  addu      $v1, $v1, $v0
 /* 137178 80243E38 AE630000 */  sw        $v1, ($s3)
-/* 13717C 80243E3C 0C093BA0 */  jal       pause_get_menu_string
+/* 13717C 80243E3C 0C093BA0 */  jal       pause_get_menu_msg
 /* 137180 80243E40 AD060000 */   sw       $a2, ($t0)
 /* 137184 80243E44 0040202D */  daddu     $a0, $v0, $zero
 /* 137188 80243E48 27A500BC */  addiu     $a1, $sp, 0xbc
@@ -420,13 +420,13 @@ glabel pause_tutorial_draw_contents
 /* 13719C 80243E5C 27A200CC */  addiu     $v0, $sp, 0xcc
 /* 1371A0 80243E60 AFA20014 */  sw        $v0, 0x14($sp)
 /* 1371A4 80243E64 AFA00018 */  sw        $zero, 0x18($sp)
-/* 1371A8 80243E68 0C0497DA */  jal       get_string_properties
+/* 1371A8 80243E68 0C0497DA */  jal       get_msg_properties
 /* 1371AC 80243E6C AFB4001C */   sw       $s4, 0x1c($sp)
 /* 1371B0 80243E70 8FB000C0 */  lw        $s0, 0xc0($sp)
 /* 1371B4 80243E74 8FAF012C */  lw        $t7, 0x12c($sp)
 /* 1371B8 80243E78 8E240000 */  lw        $a0, ($s1)
 /* 1371BC 80243E7C 01F08023 */  subu      $s0, $t7, $s0
-/* 1371C0 80243E80 0C093BA0 */  jal       pause_get_menu_string
+/* 1371C0 80243E80 0C093BA0 */  jal       pause_get_menu_msg
 /* 1371C4 80243E84 02908007 */   srav     $s0, $s0, $s4
 /* 1371C8 80243E88 0040202D */  daddu     $a0, $v0, $zero
 /* 1371CC 80243E8C 240700FF */  addiu     $a3, $zero, 0xff
@@ -444,7 +444,7 @@ glabel pause_tutorial_draw_contents
 /* 1371FC 80243EBC 8FAF0128 */  lw        $t7, 0x128($sp)
 /* 137200 80243EC0 01D02821 */  addu      $a1, $t6, $s0
 /* 137204 80243EC4 01E63021 */  addu      $a2, $t7, $a2
-/* 137208 80243EC8 0C04993B */  jal       draw_string
+/* 137208 80243EC8 0C04993B */  jal       draw_msg
 /* 13720C 80243ECC 00C23023 */   subu     $a2, $a2, $v0
 /* 137210 80243ED0 8EA30000 */  lw        $v1, ($s5)
 /* 137214 80243ED4 8FAE012C */  lw        $t6, 0x12c($sp)
@@ -521,7 +521,7 @@ glabel pause_tutorial_draw_contents
 /* 13732C 80243FEC 00021080 */  sll       $v0, $v0, 2
 /* 137330 80243FF0 3C048025 */  lui       $a0, %hi(D_8024F058)
 /* 137334 80243FF4 00822021 */  addu      $a0, $a0, $v0
-/* 137338 80243FF8 0C093BA0 */  jal       pause_get_menu_string
+/* 137338 80243FF8 0C093BA0 */  jal       pause_get_menu_msg
 /* 13733C 80243FFC 8C84F058 */   lw       $a0, %lo(D_8024F058)($a0)
 /* 137340 80244000 0040202D */  daddu     $a0, $v0, $zero
 /* 137344 80244004 2625000A */  addiu     $a1, $s1, 0xa
@@ -529,7 +529,7 @@ glabel pause_tutorial_draw_contents
 /* 13734C 8024400C 240700FF */  addiu     $a3, $zero, 0xff
 /* 137350 80244010 AFB60010 */  sw        $s6, 0x10($sp)
 /* 137354 80244014 AFA00014 */  sw        $zero, 0x14($sp)
-/* 137358 80244018 0C04993B */  jal       draw_string
+/* 137358 80244018 0C04993B */  jal       draw_msg
 /* 13735C 8024401C 25C6002C */   addiu    $a2, $t6, 0x2c
 .L80244020:
 /* 137360 80244020 8FBF00FC */  lw        $ra, 0xfc($sp)
diff --git a/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s
index c1921506cf..172b2b0ff2 100644
--- a/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s
+++ b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s
@@ -153,13 +153,13 @@ glabel pause_tabs_handle_input
 /* 1388C4 80245584 00021080 */  sll       $v0, $v0, 2
 /* 1388C8 80245588 3C048025 */  lui       $a0, %hi(D_8024F2E8)
 /* 1388CC 8024558C 00822021 */  addu      $a0, $a0, $v0
-/* 1388D0 80245590 0C093BA0 */  jal       pause_get_menu_string
+/* 1388D0 80245590 0C093BA0 */  jal       pause_get_menu_msg
 /* 1388D4 80245594 8C84F2E8 */   lw       $a0, %lo(D_8024F2E8)($a0)
 /* 1388D8 80245598 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 1388DC 8024559C 8FB10014 */  lw        $s1, 0x14($sp)
 /* 1388E0 802455A0 8FB00010 */  lw        $s0, 0x10($sp)
-/* 1388E4 802455A4 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 1388E8 802455A8 AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescString)($at)
+/* 1388E4 802455A4 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 1388E8 802455A8 AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescMsg)($at)
 /* 1388EC 802455AC 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescIconScript)
 /* 1388F0 802455B0 AC2000CC */  sw        $zero, %lo(gPauseMenuCurrentDescIconScript)($at)
 /* 1388F4 802455B4 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s
index b4b4228f65..ffc55b5f11 100644
--- a/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s
+++ b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s
@@ -401,7 +401,7 @@ glabel pause_badges_draw_contents
 /* 13AE10 80247AD0 8FAA0088 */  lw        $t2, 0x88($sp)
 /* 13AE14 80247AD4 11400018 */  beqz      $t2, .L80247B38
 /* 13AE18 80247AD8 00131400 */   sll      $v0, $s3, 0x10
-/* 13AE1C 80247ADC 0C093BA0 */  jal       pause_get_menu_string
+/* 13AE1C 80247ADC 0C093BA0 */  jal       pause_get_menu_msg
 /* 13AE20 80247AE0 24040045 */   addiu    $a0, $zero, 0x45
 /* 13AE24 80247AE4 02E0202D */  daddu     $a0, $s7, $zero
 /* 13AE28 80247AE8 0C091CAA */  jal       pause_badges_scroll_offset_x
@@ -420,7 +420,7 @@ glabel pause_badges_draw_contents
 /* 13AE5C 80247B1C 8FAA0064 */  lw        $t2, 0x64($sp)
 /* 13AE60 80247B20 00543021 */  addu      $a2, $v0, $s4
 /* 13AE64 80247B24 AFAB0010 */  sw        $t3, 0x10($sp)
-/* 13AE68 80247B28 0C04993B */  jal       draw_string
+/* 13AE68 80247B28 0C04993B */  jal       draw_msg
 /* 13AE6C 80247B2C AFAA0014 */   sw       $t2, 0x14($sp)
 /* 13AE70 80247B30 08091F09 */  j         .L80247C24
 /* 13AE74 80247B34 00000000 */   nop
@@ -450,7 +450,7 @@ glabel pause_badges_draw_contents
 /* 13AED0 80247B90 AFAA0010 */  sw        $t2, 0x10($sp)
 /* 13AED4 80247B94 AFAB0014 */  sw        $t3, 0x14($sp)
 /* 13AED8 80247B98 8E240000 */  lw        $a0, ($s1)
-/* 13AEDC 80247B9C 0C04993B */  jal       draw_string
+/* 13AEDC 80247B9C 0C04993B */  jal       draw_msg
 /* 13AEE0 80247BA0 00543021 */   addu     $a2, $v0, $s4
 .L80247BA4:
 /* 13AEE4 80247BA4 0C091CAA */  jal       pause_badges_scroll_offset_x
@@ -1002,7 +1002,7 @@ glabel pause_badges_draw_contents
 /* 13B6F0 802483B0 8E040040 */  lw        $a0, 0x40($s0)
 /* 13B6F4 802483B4 0C0511F8 */  jal       draw_hud_element_3
 /* 13B6F8 802483B8 2413000A */   addiu    $s3, $zero, 0xa
-/* 13B6FC 802483BC 0C093BA0 */  jal       pause_get_menu_string
+/* 13B6FC 802483BC 0C093BA0 */  jal       pause_get_menu_msg
 /* 13B700 802483C0 24040046 */   addiu    $a0, $zero, 0x46
 /* 13B704 802483C4 0040202D */  daddu     $a0, $v0, $zero
 /* 13B708 802483C8 240700FF */  addiu     $a3, $zero, 0xff
@@ -1013,7 +1013,7 @@ glabel pause_badges_draw_contents
 /* 13B71C 802483DC AFA20014 */  sw        $v0, 0x14($sp)
 /* 13B720 802483E0 25650010 */  addiu     $a1, $t3, 0x10
 /* 13B724 802483E4 2550004A */  addiu     $s0, $t2, 0x4a
-/* 13B728 802483E8 0C04993B */  jal       draw_string
+/* 13B728 802483E8 0C04993B */  jal       draw_msg
 /* 13B72C 802483EC 0200302D */   daddu    $a2, $s0, $zero
 /* 13B730 802483F0 0200302D */  daddu     $a2, $s0, $zero
 /* 13B734 802483F4 24070001 */  addiu     $a3, $zero, 1
@@ -1369,7 +1369,7 @@ glabel pause_badges_draw_contents
 /* 13BC7C 8024893C AFA20048 */  sw        $v0, 0x48($sp)
 /* 13BC80 80248940 0C03D4B8 */  jal       draw_box
 /* 13BC84 80248944 AFA0004C */   sw       $zero, 0x4c($sp)
-/* 13BC88 80248948 0C093BA0 */  jal       pause_get_menu_string
+/* 13BC88 80248948 0C093BA0 */  jal       pause_get_menu_msg
 /* 13BC8C 8024894C 24040047 */   addiu    $a0, $zero, 0x47
 /* 13BC90 80248950 3C118027 */  lui       $s1, %hi(gBadgeMenuCurrentTab)
 /* 13BC94 80248954 2631039C */  addiu     $s1, $s1, %lo(gBadgeMenuCurrentTab)
@@ -1388,7 +1388,7 @@ glabel pause_badges_draw_contents
 .L80248984:
 /* 13BCC4 80248984 0040202D */  daddu     $a0, $v0, $zero
 /* 13BCC8 80248988 AFA00010 */  sw        $zero, 0x10($sp)
-/* 13BCCC 8024898C 0C04993B */  jal       draw_string
+/* 13BCCC 8024898C 0C04993B */  jal       draw_msg
 /* 13BCD0 80248990 AFB00014 */   sw       $s0, 0x14($sp)
 /* 13BCD4 80248994 8E230000 */  lw        $v1, ($s1)
 /* 13BCD8 80248998 8FA600C4 */  lw        $a2, 0xc4($sp)
@@ -1428,7 +1428,7 @@ glabel pause_badges_draw_contents
 /* 13BD54 80248A14 AFA20048 */  sw        $v0, 0x48($sp)
 /* 13BD58 80248A18 0C03D4B8 */  jal       draw_box
 /* 13BD5C 80248A1C AFA0004C */   sw       $zero, 0x4c($sp)
-/* 13BD60 80248A20 0C093BA0 */  jal       pause_get_menu_string
+/* 13BD60 80248A20 0C093BA0 */  jal       pause_get_menu_msg
 /* 13BD64 80248A24 24040048 */   addiu    $a0, $zero, 0x48
 /* 13BD68 80248A28 3C118027 */  lui       $s1, %hi(gBadgeMenuCurrentTab)
 /* 13BD6C 80248A2C 2631039C */  addiu     $s1, $s1, %lo(gBadgeMenuCurrentTab)
@@ -1447,9 +1447,9 @@ glabel pause_badges_draw_contents
 .L80248A5C:
 /* 13BD9C 80248A5C 0040202D */  daddu     $a0, $v0, $zero
 /* 13BDA0 80248A60 AFA00010 */  sw        $zero, 0x10($sp)
-/* 13BDA4 80248A64 0C04993B */  jal       draw_string
+/* 13BDA4 80248A64 0C04993B */  jal       draw_msg
 /* 13BDA8 80248A68 AFB00014 */   sw       $s0, 0x14($sp)
-/* 13BDAC 80248A6C 0C093BA0 */  jal       pause_get_menu_string
+/* 13BDAC 80248A6C 0C093BA0 */  jal       pause_get_menu_msg
 /* 13BDB0 80248A70 24040049 */   addiu    $a0, $zero, 0x49
 /* 13BDB4 80248A74 8FAA00C4 */  lw        $t2, 0xc4($sp)
 /* 13BDB8 80248A78 8E230000 */  lw        $v1, ($s1)
@@ -1465,7 +1465,7 @@ glabel pause_badges_draw_contents
 .L80248A9C:
 /* 13BDDC 80248A9C 0040202D */  daddu     $a0, $v0, $zero
 /* 13BDE0 80248AA0 AFA00010 */  sw        $zero, 0x10($sp)
-/* 13BDE4 80248AA4 0C04993B */  jal       draw_string
+/* 13BDE4 80248AA4 0C04993B */  jal       draw_msg
 /* 13BDE8 80248AA8 AFB00014 */   sw       $s0, 0x14($sp)
 /* 13BDEC 80248AAC 3C038027 */  lui       $v1, %hi(gPauseMenuCurrentTab)
 /* 13BDF0 80248AB0 806300D4 */  lb        $v1, %lo(gPauseMenuCurrentTab)($v1)
@@ -1596,7 +1596,7 @@ glabel pause_badges_draw_contents
 /* 13BFCC 80248C8C 25660043 */  addiu     $a2, $t3, 0x43
 /* 13BFD0 80248C90 0C03D4B8 */  jal       draw_box
 /* 13BFD4 80248C94 2547003C */   addiu    $a3, $t2, 0x3c
-/* 13BFD8 80248C98 0C093BA0 */  jal       pause_get_menu_string
+/* 13BFD8 80248C98 0C093BA0 */  jal       pause_get_menu_msg
 /* 13BFDC 80248C9C 2404004A */   addiu    $a0, $zero, 0x4a
 /* 13BFE0 80248CA0 0040202D */  daddu     $a0, $v0, $zero
 /* 13BFE4 80248CA4 8FAB00C4 */  lw        $t3, 0xc4($sp)
@@ -1635,7 +1635,7 @@ glabel pause_badges_draw_contents
 /* 13C064 80248D24 25660043 */  addiu     $a2, $t3, 0x43
 /* 13C068 80248D28 0C03D4B8 */  jal       draw_box
 /* 13C06C 80248D2C 2547003C */   addiu    $a3, $t2, 0x3c
-/* 13C070 80248D30 0C093BA0 */  jal       pause_get_menu_string
+/* 13C070 80248D30 0C093BA0 */  jal       pause_get_menu_msg
 /* 13C074 80248D34 2404004B */   addiu    $a0, $zero, 0x4b
 /* 13C078 80248D38 0040202D */  daddu     $a0, $v0, $zero
 /* 13C07C 80248D3C 8FAB00C4 */  lw        $t3, 0xc4($sp)
@@ -1645,7 +1645,7 @@ glabel pause_badges_draw_contents
 /* 13C08C 80248D4C AFB00014 */  sw        $s0, 0x14($sp)
 /* 13C090 80248D50 2565005A */  addiu     $a1, $t3, 0x5a
 .L80248D54:
-/* 13C094 80248D54 0C04993B */  jal       draw_string
+/* 13C094 80248D54 0C04993B */  jal       draw_msg
 /* 13C098 80248D58 25460042 */   addiu    $a2, $t2, 0x42
 .L80248D5C:
 /* 13C09C 80248D5C 8FBF00BC */  lw        $ra, 0xbc($sp)
diff --git a/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_handle_input.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_handle_input.s
index 7fc8119645..78ea0203af 100644
--- a/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_handle_input.s
+++ b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_handle_input.s
@@ -325,13 +325,13 @@ glabel pause_badges_handle_input
 /* 13C880 80249540 3C018008 */  lui       $at, %hi(gItemTable+0x10)
 /* 13C884 80249544 00220821 */  addu      $at, $at, $v0
 /* 13C888 80249548 8C2278F0 */  lw        $v0, %lo(gItemTable+0x10)($at)
-/* 13C88C 8024954C 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13C890 80249550 AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescString)($at)
+/* 13C88C 8024954C 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13C890 80249550 AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescMsg)($at)
 /* 13C894 80249554 08092566 */  j         .L80249598
 /* 13C898 80249558 00000000 */   nop
 .L8024955C:
-/* 13C89C 8024955C 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13C8A0 80249560 AC2000C8 */  sw        $zero, %lo(gPauseMenuCurrentDescString)($at)
+/* 13C89C 8024955C 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13C8A0 80249560 AC2000C8 */  sw        $zero, %lo(gPauseMenuCurrentDescMsg)($at)
 /* 13C8A4 80249564 08092564 */  j         .L80249590
 /* 13C8A8 80249568 00000000 */   nop
 .L8024956C:
@@ -341,10 +341,10 @@ glabel pause_badges_handle_input
 /* 13C8B8 80249578 2404004D */   addiu    $a0, $zero, 0x4d
 /* 13C8BC 8024957C 2404004C */  addiu     $a0, $zero, 0x4c
 .L80249580:
-/* 13C8C0 80249580 0C093BA0 */  jal       pause_get_menu_string
+/* 13C8C0 80249580 0C093BA0 */  jal       pause_get_menu_msg
 /* 13C8C4 80249584 00000000 */   nop
-/* 13C8C8 80249588 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13C8CC 8024958C AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescString)($at)
+/* 13C8C8 80249588 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13C8CC 8024958C AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescMsg)($at)
 .L80249590:
 /* 13C8D0 80249590 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescIconScript)
 /* 13C8D4 80249594 AC2000CC */  sw        $zero, %lo(gPauseMenuCurrentDescIconScript)($at)
diff --git a/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s
index 8476231877..177d006f95 100644
--- a/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s
+++ b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s
@@ -27,7 +27,7 @@ glabel pause_stats_draw_contents
 /* 138D18 802459D8 8E24000C */  lw        $a0, 0xc($s1)
 /* 138D1C 802459DC 0C0511F8 */  jal       draw_hud_element_3
 /* 138D20 802459E0 27D00065 */   addiu    $s0, $fp, 0x65
-/* 138D24 802459E4 0C093BA0 */  jal       pause_get_menu_string
+/* 138D24 802459E4 0C093BA0 */  jal       pause_get_menu_msg
 /* 138D28 802459E8 24040032 */   addiu    $a0, $zero, 0x32
 /* 138D2C 802459EC 0040202D */  daddu     $a0, $v0, $zero
 /* 138D30 802459F0 0200302D */  daddu     $a2, $s0, $zero
@@ -39,7 +39,7 @@ glabel pause_stats_draw_contents
 /* 138D48 80245A08 2408000A */  addiu     $t0, $zero, 0xa
 /* 138D4C 80245A0C AFA80010 */  sw        $t0, 0x10($sp)
 /* 138D50 80245A10 24080001 */  addiu     $t0, $zero, 1
-/* 138D54 80245A14 0C04993B */  jal       draw_string
+/* 138D54 80245A14 0C04993B */  jal       draw_msg
 /* 138D58 80245A18 AFA80014 */   sw       $t0, 0x14($sp)
 /* 138D5C 80245A1C 0200302D */  daddu     $a2, $s0, $zero
 /* 138D60 80245A20 24070001 */  addiu     $a3, $zero, 1
@@ -71,7 +71,7 @@ glabel pause_stats_draw_contents
 /* 138DC8 80245A88 8E240010 */  lw        $a0, 0x10($s1)
 /* 138DCC 80245A8C 0C0511F8 */  jal       draw_hud_element_3
 /* 138DD0 80245A90 27D5007B */   addiu    $s5, $fp, 0x7b
-/* 138DD4 80245A94 0C093BA0 */  jal       pause_get_menu_string
+/* 138DD4 80245A94 0C093BA0 */  jal       pause_get_menu_msg
 /* 138DD8 80245A98 24040033 */   addiu    $a0, $zero, 0x33
 /* 138DDC 80245A9C 0040202D */  daddu     $a0, $v0, $zero
 /* 138DE0 80245AA0 0200302D */  daddu     $a2, $s0, $zero
@@ -80,7 +80,7 @@ glabel pause_stats_draw_contents
 /* 138DEC 80245AAC 2408000A */  addiu     $t0, $zero, 0xa
 /* 138DF0 80245AB0 AFA80010 */  sw        $t0, 0x10($sp)
 /* 138DF4 80245AB4 24080001 */  addiu     $t0, $zero, 1
-/* 138DF8 80245AB8 0C04993B */  jal       draw_string
+/* 138DF8 80245AB8 0C04993B */  jal       draw_msg
 /* 138DFC 80245ABC AFA80014 */   sw       $t0, 0x14($sp)
 /* 138E00 80245AC0 0280282D */  daddu     $a1, $s4, $zero
 /* 138E04 80245AC4 0200302D */  daddu     $a2, $s0, $zero
@@ -107,7 +107,7 @@ glabel pause_stats_draw_contents
 /* 138E58 80245B18 8E240014 */  lw        $a0, 0x14($s1)
 /* 138E5C 80245B1C 0C0511F8 */  jal       draw_hud_element_3
 /* 138E60 80245B20 00000000 */   nop
-/* 138E64 80245B24 0C093BA0 */  jal       pause_get_menu_string
+/* 138E64 80245B24 0C093BA0 */  jal       pause_get_menu_msg
 /* 138E68 80245B28 24040034 */   addiu    $a0, $zero, 0x34
 /* 138E6C 80245B2C 0040202D */  daddu     $a0, $v0, $zero
 /* 138E70 80245B30 0200302D */  daddu     $a2, $s0, $zero
@@ -116,7 +116,7 @@ glabel pause_stats_draw_contents
 /* 138E7C 80245B3C 2408000A */  addiu     $t0, $zero, 0xa
 /* 138E80 80245B40 AFA80010 */  sw        $t0, 0x10($sp)
 /* 138E84 80245B44 24080001 */  addiu     $t0, $zero, 1
-/* 138E88 80245B48 0C04993B */  jal       draw_string
+/* 138E88 80245B48 0C04993B */  jal       draw_msg
 /* 138E8C 80245B4C AFA80014 */   sw       $t0, 0x14($sp)
 /* 138E90 80245B50 0280282D */  daddu     $a1, $s4, $zero
 /* 138E94 80245B54 0200302D */  daddu     $a2, $s0, $zero
@@ -151,7 +151,7 @@ glabel pause_stats_draw_contents
 /* 138F08 80245BC8 8E24001C */  lw        $a0, 0x1c($s1)
 /* 138F0C 80245BCC 0C0511F8 */  jal       draw_hud_element_3
 /* 138F10 80245BD0 00000000 */   nop
-/* 138F14 80245BD4 0C093BA0 */  jal       pause_get_menu_string
+/* 138F14 80245BD4 0C093BA0 */  jal       pause_get_menu_msg
 /* 138F18 80245BD8 24040036 */   addiu    $a0, $zero, 0x36
 /* 138F1C 80245BDC 0040202D */  daddu     $a0, $v0, $zero
 /* 138F20 80245BE0 0200302D */  daddu     $a2, $s0, $zero
@@ -161,7 +161,7 @@ glabel pause_stats_draw_contents
 /* 138F30 80245BF0 25140019 */  addiu     $s4, $t0, 0x19
 /* 138F34 80245BF4 0280282D */  daddu     $a1, $s4, $zero
 /* 138F38 80245BF8 24080001 */  addiu     $t0, $zero, 1
-/* 138F3C 80245BFC 0C04993B */  jal       draw_string
+/* 138F3C 80245BFC 0C04993B */  jal       draw_msg
 /* 138F40 80245C00 AFA80014 */   sw       $t0, 0x14($sp)
 /* 138F44 80245C04 0200302D */  daddu     $a2, $s0, $zero
 /* 138F48 80245C08 8FA80084 */  lw        $t0, 0x84($sp)
@@ -175,7 +175,7 @@ glabel pause_stats_draw_contents
 /* 138F68 80245C28 240800FF */  addiu     $t0, $zero, 0xff
 /* 138F6C 80245C2C 0C049DA7 */  jal       draw_number
 /* 138F70 80245C30 AFA80014 */   sw       $t0, 0x14($sp)
-/* 138F74 80245C34 0C093BA0 */  jal       pause_get_menu_string
+/* 138F74 80245C34 0C093BA0 */  jal       pause_get_menu_msg
 /* 138F78 80245C38 24040039 */   addiu    $a0, $zero, 0x39
 /* 138F7C 80245C3C 0040202D */  daddu     $a0, $v0, $zero
 /* 138F80 80245C40 0260282D */  daddu     $a1, $s3, $zero
@@ -183,7 +183,7 @@ glabel pause_stats_draw_contents
 /* 138F88 80245C48 240700FF */  addiu     $a3, $zero, 0xff
 /* 138F8C 80245C4C 24080001 */  addiu     $t0, $zero, 1
 /* 138F90 80245C50 AFA00010 */  sw        $zero, 0x10($sp)
-/* 138F94 80245C54 0C04993B */  jal       draw_string
+/* 138F94 80245C54 0C04993B */  jal       draw_msg
 /* 138F98 80245C58 AFA80014 */   sw       $t0, 0x14($sp)
 /* 138F9C 80245C5C 0200302D */  daddu     $a2, $s0, $zero
 /* 138FA0 80245C60 8FA80084 */  lw        $t0, 0x84($sp)
@@ -208,7 +208,7 @@ glabel pause_stats_draw_contents
 /* 138FEC 80245CAC 8E240020 */  lw        $a0, 0x20($s1)
 /* 138FF0 80245CB0 0C0511F8 */  jal       draw_hud_element_3
 /* 138FF4 80245CB4 27D00055 */   addiu    $s0, $fp, 0x55
-/* 138FF8 80245CB8 0C093BA0 */  jal       pause_get_menu_string
+/* 138FF8 80245CB8 0C093BA0 */  jal       pause_get_menu_msg
 /* 138FFC 80245CBC 24040037 */   addiu    $a0, $zero, 0x37
 /* 139000 80245CC0 0040202D */  daddu     $a0, $v0, $zero
 /* 139004 80245CC4 0280282D */  daddu     $a1, $s4, $zero
@@ -216,7 +216,7 @@ glabel pause_stats_draw_contents
 /* 13900C 80245CCC 240700FF */  addiu     $a3, $zero, 0xff
 /* 139010 80245CD0 24080001 */  addiu     $t0, $zero, 1
 /* 139014 80245CD4 AFA00010 */  sw        $zero, 0x10($sp)
-/* 139018 80245CD8 0C04993B */  jal       draw_string
+/* 139018 80245CD8 0C04993B */  jal       draw_msg
 /* 13901C 80245CDC AFA80014 */   sw       $t0, 0x14($sp)
 /* 139020 80245CE0 0260282D */  daddu     $a1, $s3, $zero
 /* 139024 80245CE4 0200302D */  daddu     $a2, $s0, $zero
@@ -228,7 +228,7 @@ glabel pause_stats_draw_contents
 /* 13903C 80245CFC AFA80014 */  sw        $t0, 0x14($sp)
 /* 139040 80245D00 0C049DA7 */  jal       draw_number
 /* 139044 80245D04 AFB20018 */   sw       $s2, 0x18($sp)
-/* 139048 80245D08 0C093BA0 */  jal       pause_get_menu_string
+/* 139048 80245D08 0C093BA0 */  jal       pause_get_menu_msg
 /* 13904C 80245D0C 24040039 */   addiu    $a0, $zero, 0x39
 /* 139050 80245D10 0040202D */  daddu     $a0, $v0, $zero
 /* 139054 80245D14 0260282D */  daddu     $a1, $s3, $zero
@@ -236,7 +236,7 @@ glabel pause_stats_draw_contents
 /* 13905C 80245D1C 240700FF */  addiu     $a3, $zero, 0xff
 /* 139060 80245D20 24080001 */  addiu     $t0, $zero, 1
 /* 139064 80245D24 AFA00010 */  sw        $zero, 0x10($sp)
-/* 139068 80245D28 0C04993B */  jal       draw_string
+/* 139068 80245D28 0C04993B */  jal       draw_msg
 /* 13906C 80245D2C AFA80014 */   sw       $t0, 0x14($sp)
 /* 139070 80245D30 02E0282D */  daddu     $a1, $s7, $zero
 /* 139074 80245D34 0200302D */  daddu     $a2, $s0, $zero
@@ -259,7 +259,7 @@ glabel pause_stats_draw_contents
 /* 1390B8 80245D78 8E240024 */  lw        $a0, 0x24($s1)
 /* 1390BC 80245D7C 0C0511F8 */  jal       draw_hud_element_3
 /* 1390C0 80245D80 27D00077 */   addiu    $s0, $fp, 0x77
-/* 1390C4 80245D84 0C093BA0 */  jal       pause_get_menu_string
+/* 1390C4 80245D84 0C093BA0 */  jal       pause_get_menu_msg
 /* 1390C8 80245D88 24040038 */   addiu    $a0, $zero, 0x38
 /* 1390CC 80245D8C 0040202D */  daddu     $a0, $v0, $zero
 /* 1390D0 80245D90 0280282D */  daddu     $a1, $s4, $zero
@@ -267,7 +267,7 @@ glabel pause_stats_draw_contents
 /* 1390D8 80245D98 240700FF */  addiu     $a3, $zero, 0xff
 /* 1390DC 80245D9C 24080001 */  addiu     $t0, $zero, 1
 /* 1390E0 80245DA0 AFA00010 */  sw        $zero, 0x10($sp)
-/* 1390E4 80245DA4 0C04993B */  jal       draw_string
+/* 1390E4 80245DA4 0C04993B */  jal       draw_msg
 /* 1390E8 80245DA8 AFA80014 */   sw       $t0, 0x14($sp)
 /* 1390EC 80245DAC 0260282D */  daddu     $a1, $s3, $zero
 /* 1390F0 80245DB0 0200302D */  daddu     $a2, $s0, $zero
@@ -286,7 +286,7 @@ glabel pause_stats_draw_contents
 /* 139124 80245DE4 8E240018 */  lw        $a0, 0x18($s1)
 /* 139128 80245DE8 0C0511F8 */  jal       draw_hud_element_3
 /* 13912C 80245DEC 27D50085 */   addiu    $s5, $fp, 0x85
-/* 139130 80245DF0 0C093BA0 */  jal       pause_get_menu_string
+/* 139130 80245DF0 0C093BA0 */  jal       pause_get_menu_msg
 /* 139134 80245DF4 24040035 */   addiu    $a0, $zero, 0x35
 /* 139138 80245DF8 0040202D */  daddu     $a0, $v0, $zero
 /* 13913C 80245DFC 02A0302D */  daddu     $a2, $s5, $zero
@@ -295,7 +295,7 @@ glabel pause_stats_draw_contents
 /* 139148 80245E08 2408000A */  addiu     $t0, $zero, 0xa
 /* 13914C 80245E0C AFA80010 */  sw        $t0, 0x10($sp)
 /* 139150 80245E10 24080001 */  addiu     $t0, $zero, 1
-/* 139154 80245E14 0C04993B */  jal       draw_string
+/* 139154 80245E14 0C04993B */  jal       draw_msg
 /* 139158 80245E18 AFA80014 */   sw       $t0, 0x14($sp)
 /* 13915C 80245E1C 3C020149 */  lui       $v0, 0x149
 /* 139160 80245E20 3C148011 */  lui       $s4, %hi(gPlayerData+0x2BC)
@@ -356,7 +356,7 @@ glabel pause_stats_draw_contents
 /* 139238 80245EF8 02338823 */  subu      $s1, $s1, $s3
 /* 13923C 80245EFC 0C049DA7 */  jal       draw_number
 /* 139240 80245F00 02242023 */   subu     $a0, $s1, $a0
-/* 139244 80245F04 0C093BA0 */  jal       pause_get_menu_string
+/* 139244 80245F04 0C093BA0 */  jal       pause_get_menu_msg
 /* 139248 80245F08 2404003A */   addiu    $a0, $zero, 0x3a
 /* 13924C 80245F0C 0040202D */  daddu     $a0, $v0, $zero
 /* 139250 80245F10 27C60084 */  addiu     $a2, $fp, 0x84
@@ -367,9 +367,9 @@ glabel pause_stats_draw_contents
 /* 139264 80245F24 2408000A */  addiu     $t0, $zero, 0xa
 /* 139268 80245F28 AFA80010 */  sw        $t0, 0x10($sp)
 /* 13926C 80245F2C 24080001 */  addiu     $t0, $zero, 1
-/* 139270 80245F30 0C04993B */  jal       draw_string
+/* 139270 80245F30 0C04993B */  jal       draw_msg
 /* 139274 80245F34 AFA80014 */   sw       $t0, 0x14($sp)
-/* 139278 80245F38 0C093BA0 */  jal       pause_get_menu_string
+/* 139278 80245F38 0C093BA0 */  jal       pause_get_menu_msg
 /* 13927C 80245F3C 2404003A */   addiu    $a0, $zero, 0x3a
 /* 139280 80245F40 0040202D */  daddu     $a0, $v0, $zero
 /* 139284 80245F44 0200282D */  daddu     $a1, $s0, $zero
@@ -378,7 +378,7 @@ glabel pause_stats_draw_contents
 /* 139290 80245F50 2408000A */  addiu     $t0, $zero, 0xa
 /* 139294 80245F54 AFA80010 */  sw        $t0, 0x10($sp)
 /* 139298 80245F58 24080001 */  addiu     $t0, $zero, 1
-/* 13929C 80245F5C 0C04993B */  jal       draw_string
+/* 13929C 80245F5C 0C04993B */  jal       draw_msg
 /* 1392A0 80245F60 AFA80014 */   sw       $t0, 0x14($sp)
 /* 1392A4 80245F64 3C027482 */  lui       $v0, 0x7482
 /* 1392A8 80245F68 3442296B */  ori       $v0, $v0, 0x296b
@@ -478,7 +478,7 @@ glabel pause_stats_draw_contents
 /* 139418 802460D8 8EC40000 */  lw        $a0, ($s6)
 /* 13941C 802460DC 0C0511F8 */  jal       draw_hud_element_3
 /* 139420 802460E0 27D0000E */   addiu    $s0, $fp, 0xe
-/* 139424 802460E4 0C093BA0 */  jal       pause_get_menu_string
+/* 139424 802460E4 0C093BA0 */  jal       pause_get_menu_msg
 /* 139428 802460E8 24040043 */   addiu    $a0, $zero, 0x43
 /* 13942C 802460EC 0040202D */  daddu     $a0, $v0, $zero
 /* 139430 802460F0 0200302D */  daddu     $a2, $s0, $zero
@@ -487,9 +487,9 @@ glabel pause_stats_draw_contents
 /* 13943C 802460FC 24170001 */  addiu     $s7, $zero, 1
 /* 139440 80246100 AFA00010 */  sw        $zero, 0x10($sp)
 /* 139444 80246104 AFB70014 */  sw        $s7, 0x14($sp)
-/* 139448 80246108 0C04993B */  jal       draw_string
+/* 139448 80246108 0C04993B */  jal       draw_msg
 /* 13944C 8024610C 25050010 */   addiu    $a1, $t0, 0x10
-/* 139450 80246110 0C093BA0 */  jal       pause_get_menu_string
+/* 139450 80246110 0C093BA0 */  jal       pause_get_menu_msg
 /* 139454 80246114 24040044 */   addiu    $a0, $zero, 0x44
 /* 139458 80246118 0040202D */  daddu     $a0, $v0, $zero
 /* 13945C 8024611C 0200302D */  daddu     $a2, $s0, $zero
@@ -497,7 +497,7 @@ glabel pause_stats_draw_contents
 /* 139464 80246124 0220382D */  daddu     $a3, $s1, $zero
 /* 139468 80246128 AFA00010 */  sw        $zero, 0x10($sp)
 /* 13946C 8024612C AFB70014 */  sw        $s7, 0x14($sp)
-/* 139470 80246130 0C04993B */  jal       draw_string
+/* 139470 80246130 0C04993B */  jal       draw_msg
 /* 139474 80246134 25050043 */   addiu    $a1, $t0, 0x43
 /* 139478 80246138 00142400 */  sll       $a0, $s4, 0x10
 /* 13947C 8024613C 00042403 */  sra       $a0, $a0, 0x10
@@ -564,7 +564,7 @@ glabel pause_stats_draw_contents
 /* 139560 80246220 3C048025 */  lui       $a0, %hi(D_8024F380)
 /* 139564 80246224 00902021 */  addu      $a0, $a0, $s0
 /* 139568 80246228 8C84F380 */  lw        $a0, %lo(D_8024F380)($a0)
-/* 13956C 8024622C 0C093BA0 */  jal       pause_get_menu_string
+/* 13956C 8024622C 0C093BA0 */  jal       pause_get_menu_msg
 /* 139570 80246230 00138400 */   sll      $s0, $s3, 0x10
 /* 139574 80246234 0040202D */  daddu     $a0, $v0, $zero
 /* 139578 80246238 27C60017 */  addiu     $a2, $fp, 0x17
@@ -573,7 +573,7 @@ glabel pause_stats_draw_contents
 /* 139584 80246244 AFA00010 */  sw        $zero, 0x10($sp)
 /* 139588 80246248 AFB70014 */  sw        $s7, 0x14($sp)
 /* 13958C 8024624C 251200B0 */  addiu     $s2, $t0, 0xb0
-/* 139590 80246250 0C04993B */  jal       draw_string
+/* 139590 80246250 0C04993B */  jal       draw_msg
 /* 139594 80246254 0240282D */   daddu    $a1, $s2, $zero
 /* 139598 80246258 00108383 */  sra       $s0, $s0, 0xe
 /* 13959C 8024625C 8EC40008 */  lw        $a0, 8($s6)
@@ -591,14 +591,14 @@ glabel pause_stats_draw_contents
 /* 1395CC 8024628C 0260A82D */   daddu    $s5, $s3, $zero
 /* 1395D0 80246290 3C048025 */  lui       $a0, %hi(D_8024F390)
 /* 1395D4 80246294 00902021 */  addu      $a0, $a0, $s0
-/* 1395D8 80246298 0C093BA0 */  jal       pause_get_menu_string
+/* 1395D8 80246298 0C093BA0 */  jal       pause_get_menu_msg
 /* 1395DC 8024629C 8C84F390 */   lw       $a0, %lo(D_8024F390)($a0)
 /* 1395E0 802462A0 0040202D */  daddu     $a0, $v0, $zero
 /* 1395E4 802462A4 0240282D */  daddu     $a1, $s2, $zero
 /* 1395E8 802462A8 27C60030 */  addiu     $a2, $fp, 0x30
 /* 1395EC 802462AC 240700FF */  addiu     $a3, $zero, 0xff
 /* 1395F0 802462B0 AFA00010 */  sw        $zero, 0x10($sp)
-/* 1395F4 802462B4 0C04993B */  jal       draw_string
+/* 1395F4 802462B4 0C04993B */  jal       draw_msg
 /* 1395F8 802462B8 AFB70014 */   sw       $s7, 0x14($sp)
 /* 1395FC 802462BC 24040006 */  addiu     $a0, $zero, 6
 /* 139600 802462C0 8FA80084 */  lw        $t0, 0x84($sp)
diff --git a/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_handle_input.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_handle_input.s
index 858c9f5909..96af2c0422 100644
--- a/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_handle_input.s
+++ b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_handle_input.s
@@ -266,12 +266,12 @@ glabel pause_stats_handle_input
 /* 13A278 80246F38 3C048025 */  lui       $a0, %hi(D_8024F3B8)
 /* 13A27C 80246F3C 00822021 */  addu      $a0, $a0, $v0
 /* 13A280 80246F40 8C84F3B8 */  lw        $a0, %lo(D_8024F3B8)($a0)
-/* 13A284 80246F44 0C093BA0 */  jal       pause_get_menu_string
+/* 13A284 80246F44 0C093BA0 */  jal       pause_get_menu_msg
 /* 13A288 80246F48 00912021 */   addu     $a0, $a0, $s1
 /* 13A28C 80246F4C 3C038027 */  lui       $v1, %hi(gPauseMenuPressedButtons)
 /* 13A290 80246F50 8C6300C4 */  lw        $v1, %lo(gPauseMenuPressedButtons)($v1)
-/* 13A294 80246F54 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13A298 80246F58 AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescString)($at)
+/* 13A294 80246F54 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13A298 80246F58 AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescMsg)($at)
 /* 13A29C 80246F5C 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescIconScript)
 /* 13A2A0 80246F60 AC2000CC */  sw        $zero, %lo(gPauseMenuCurrentDescIconScript)($at)
 /* 13A2A4 80246F64 30634000 */  andi      $v1, $v1, 0x4000
diff --git a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist.s
index 41065dea09..af6ab5abfd 100644
--- a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist.s
+++ b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist.s
@@ -125,7 +125,7 @@ glabel pause_partners_draw_movelist
 /* 13F238 8024BEF8 2408000A */  addiu     $t0, $zero, 0xa
 /* 13F23C 8024BEFC AFA80010 */  sw        $t0, 0x10($sp)
 /* 13F240 8024BF00 24080001 */  addiu     $t0, $zero, 1
-/* 13F244 8024BF04 0C04993B */  jal       draw_string
+/* 13F244 8024BF04 0C04993B */  jal       draw_msg
 /* 13F248 8024BF08 AFA80014 */   sw       $t0, 0x14($sp)
 /* 13F24C 8024BF0C 26500004 */  addiu     $s0, $s2, 4
 /* 13F250 8024BF10 00108080 */  sll       $s0, $s0, 2
diff --git a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist_title.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist_title.s
index 78a76e1ca0..ad6a7e7c65 100644
--- a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist_title.s
+++ b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist_title.s
@@ -8,7 +8,7 @@ glabel pause_partners_draw_movelist_title
 /* 13F394 8024C054 AFB1001C */  sw        $s1, 0x1c($sp)
 /* 13F398 8024C058 00C0882D */  daddu     $s1, $a2, $zero
 /* 13F39C 8024C05C AFBF0020 */  sw        $ra, 0x20($sp)
-/* 13F3A0 8024C060 0C093BA0 */  jal       pause_get_menu_string
+/* 13F3A0 8024C060 0C093BA0 */  jal       pause_get_menu_msg
 /* 13F3A4 8024C064 24040055 */   addiu    $a0, $zero, 0x55
 /* 13F3A8 8024C068 0040202D */  daddu     $a0, $v0, $zero
 /* 13F3AC 8024C06C 2402FFFF */  addiu     $v0, $zero, -1
@@ -17,7 +17,7 @@ glabel pause_partners_draw_movelist_title
 /* 13F3B8 8024C078 2605000C */  addiu     $a1, $s0, 0xc
 /* 13F3BC 8024C07C 02223021 */  addu      $a2, $s1, $v0
 /* 13F3C0 8024C080 240700FF */  addiu     $a3, $zero, 0xff
-/* 13F3C4 8024C084 0C04993B */  jal       draw_string
+/* 13F3C4 8024C084 0C04993B */  jal       draw_msg
 /* 13F3C8 8024C088 AFA20014 */   sw       $v0, 0x14($sp)
 /* 13F3CC 8024C08C 8FBF0020 */  lw        $ra, 0x20($sp)
 /* 13F3D0 8024C090 8FB1001C */  lw        $s1, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s
index d51340eea4..056c574a06 100644
--- a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s
+++ b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s
@@ -41,7 +41,7 @@ glabel pause_partners_draw_title
 /* 13EF7C 8024BC3C 000318C0 */  sll       $v1, $v1, 3
 /* 13EF80 8024BC40 00431021 */  addu      $v0, $v0, $v1
 /* 13EF84 8024BC44 80500015 */  lb        $s0, 0x15($v0)
-/* 13EF88 8024BC48 0C04991D */  jal       get_string_width
+/* 13EF88 8024BC48 0C04991D */  jal       get_msg_width
 /* 13EF8C 8024BC4C 0220202D */   daddu    $a0, $s1, $zero
 /* 13EF90 8024BC50 0040302D */  daddu     $a2, $v0, $zero
 /* 13EF94 8024BC54 24020001 */  addiu     $v0, $zero, 1
@@ -63,7 +63,7 @@ glabel pause_partners_draw_title
 /* 13EFCC 8024BC8C 26660001 */  addiu     $a2, $s3, 1
 /* 13EFD0 8024BC90 240700FF */  addiu     $a3, $zero, 0xff
 /* 13EFD4 8024BC94 AFA00010 */  sw        $zero, 0x10($sp)
-/* 13EFD8 8024BC98 0C04993B */  jal       draw_string
+/* 13EFD8 8024BC98 0C04993B */  jal       draw_msg
 /* 13EFDC 8024BC9C AFA00014 */   sw       $zero, 0x14($sp)
 /* 13EFE0 8024BCA0 24020001 */  addiu     $v0, $zero, 1
 /* 13EFE4 8024BCA4 1602000A */  bne       $s0, $v0, .L8024BCD0
diff --git a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_handle_input.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_handle_input.s
index fc770987a1..e18c9a7302 100644
--- a/ver/us/asm/nonmatchings/pause/13E120/pause_partners_handle_input.s
+++ b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_handle_input.s
@@ -304,8 +304,8 @@ glabel pause_partners_handle_input
 /* 13FAC0 8024C780 00220821 */  addu      $at, $at, $v0
 /* 13FAC4 8024C784 8C22F06C */  lw        $v0, %lo(D_8008F06C)($at)
 .L8024C788:
-/* 13FAC8 8024C788 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13FACC 8024C78C AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescString)($at)
+/* 13FAC8 8024C788 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13FACC 8024C78C AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescMsg)($at)
 .L8024C790:
 /* 13FAD0 8024C790 8FBF0018 */  lw        $ra, 0x18($sp)
 /* 13FAD4 8024C794 8FB10014 */  lw        $s1, 0x14($sp)
diff --git a/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_draw_title.s b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_draw_title.s
index 7d5cdbcc32..ea68f5d9fa 100644
--- a/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_draw_title.s
+++ b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_draw_title.s
@@ -32,12 +32,12 @@ glabel pause_spirits_draw_title
 /* 140640 8024D300 080934C5 */  j         .L8024D314
 /* 140644 8024D304 00828021 */   addu     $s0, $a0, $v0
 .L8024D308:
-/* 140648 8024D308 0C093BA0 */  jal       pause_get_menu_string
+/* 140648 8024D308 0C093BA0 */  jal       pause_get_menu_msg
 /* 14064C 8024D30C 24040056 */   addiu    $a0, $zero, 0x56
 /* 140650 8024D310 0040802D */  daddu     $s0, $v0, $zero
 .L8024D314:
 /* 140654 8024D314 0200202D */  daddu     $a0, $s0, $zero
-/* 140658 8024D318 0C04991D */  jal       get_string_width
+/* 140658 8024D318 0C04991D */  jal       get_msg_width
 /* 14065C 8024D31C 0000282D */   daddu    $a1, $zero, $zero
 /* 140660 8024D320 0200202D */  daddu     $a0, $s0, $zero
 /* 140664 8024D324 02221023 */  subu      $v0, $s1, $v0
@@ -46,7 +46,7 @@ glabel pause_spirits_draw_title
 /* 140670 8024D330 26660001 */  addiu     $a2, $s3, 1
 /* 140674 8024D334 240700FF */  addiu     $a3, $zero, 0xff
 /* 140678 8024D338 AFA00010 */  sw        $zero, 0x10($sp)
-/* 14067C 8024D33C 0C04993B */  jal       draw_string
+/* 14067C 8024D33C 0C04993B */  jal       draw_msg
 /* 140680 8024D340 AFA00014 */   sw       $zero, 0x14($sp)
 .L8024D344:
 /* 140684 8024D344 8FBF0028 */  lw        $ra, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_handle_input.s b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_handle_input.s
index 44ddde40d0..adf0a3c391 100644
--- a/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_handle_input.s
+++ b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_handle_input.s
@@ -244,7 +244,7 @@ glabel pause_spirits_handle_input
 /* 140B04 8024D7C4 0062102A */  slt       $v0, $v1, $v0
 /* 140B08 8024D7C8 14400005 */  bnez      $v0, .L8024D7E0
 /* 140B0C 8024D7CC 3C02001D */   lui      $v0, 0x1d
-/* 140B10 8024D7D0 0C093BA0 */  jal       pause_get_menu_string
+/* 140B10 8024D7D0 0C093BA0 */  jal       pause_get_menu_msg
 /* 140B14 8024D7D4 24040056 */   addiu    $a0, $zero, 0x56
 /* 140B18 8024D7D8 080935FA */  j         .L8024D7E8
 /* 140B1C 8024D7DC 00000000 */   nop
@@ -252,8 +252,8 @@ glabel pause_spirits_handle_input
 /* 140B20 8024D7E0 34420031 */  ori       $v0, $v0, 0x31
 /* 140B24 8024D7E4 00621021 */  addu      $v0, $v1, $v0
 .L8024D7E8:
-/* 140B28 8024D7E8 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 140B2C 8024D7EC AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescString)($at)
+/* 140B28 8024D7E8 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 140B2C 8024D7EC AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescMsg)($at)
 .L8024D7F0:
 /* 140B30 8024D7F0 8FBF0014 */  lw        $ra, 0x14($sp)
 /* 140B34 8024D7F4 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/pause/1421C0/pause_get_menu_string.s b/ver/us/asm/nonmatchings/pause/1421C0/pause_get_menu_msg.s
similarity index 58%
rename from ver/us/asm/nonmatchings/pause/1421C0/pause_get_menu_string.s
rename to ver/us/asm/nonmatchings/pause/1421C0/pause_get_menu_msg.s
index 3198903870..2661054335 100644
--- a/ver/us/asm/nonmatchings/pause/1421C0/pause_get_menu_string.s
+++ b/ver/us/asm/nonmatchings/pause/1421C0/pause_get_menu_msg.s
@@ -1,9 +1,9 @@
 .set noat      # allow manual use of $at
 .set noreorder # don't insert nops after branches
 
-glabel pause_get_menu_string
+glabel pause_get_menu_msg
 /* 1421C0 8024EE80 00042080 */  sll       $a0, $a0, 2
-/* 1421C4 8024EE84 3C028027 */  lui       $v0, %hi(gPauseMenuStrings)
+/* 1421C4 8024EE84 3C028027 */  lui       $v0, %hi(gPauseMenuMsgs)
 /* 1421C8 8024EE88 00441021 */  addu      $v0, $v0, $a0
 /* 1421CC 8024EE8C 03E00008 */  jr        $ra
-/* 1421D0 8024EE90 8C42F778 */   lw       $v0, %lo(gPauseMenuStrings)($v0)
+/* 1421D0 8024EE90 8C42F778 */   lw       $v0, %lo(gPauseMenuMsgs)($v0)
diff --git a/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s
index 754f6ccf53..08bbd34966 100644
--- a/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s
+++ b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s
@@ -262,7 +262,7 @@ glabel pause_items_draw_contents
 /* 13D084 80249D44 8FAA0074 */  lw        $t2, 0x74($sp)
 /* 13D088 80249D48 11400016 */  beqz      $t2, .L80249DA4
 /* 13D08C 80249D4C 00161400 */   sll      $v0, $s6, 0x10
-/* 13D090 80249D50 0C093BA0 */  jal       pause_get_menu_string
+/* 13D090 80249D50 0C093BA0 */  jal       pause_get_menu_msg
 /* 13D094 80249D54 2404004E */   addiu    $a0, $zero, 0x4e
 /* 13D098 80249D58 8FA40068 */  lw        $a0, 0x68($sp)
 /* 13D09C 80249D5C 0C09265A */  jal       pause_items_scroll_offset_x
@@ -311,7 +311,7 @@ glabel pause_items_draw_contents
 /* 13D144 80249E04 8E240000 */  lw        $a0, ($s1)
 /* 13D148 80249E08 00553021 */  addu      $a2, $v0, $s5
 .L80249E0C:
-/* 13D14C 80249E0C 0C04993B */  jal       draw_string
+/* 13D14C 80249E0C 0C04993B */  jal       draw_msg
 /* 13D150 80249E10 00000000 */   nop
 .L80249E14:
 /* 13D154 80249E14 8FAA0050 */  lw        $t2, 0x50($sp)
@@ -598,7 +598,7 @@ glabel pause_items_draw_contents
 /* 13D574 8024A234 AFA20048 */  sw        $v0, 0x48($sp)
 /* 13D578 8024A238 0C03D4B8 */  jal       draw_box
 /* 13D57C 8024A23C AFA0004C */   sw       $zero, 0x4c($sp)
-/* 13D580 8024A240 0C093BA0 */  jal       pause_get_menu_string
+/* 13D580 8024A240 0C093BA0 */  jal       pause_get_menu_msg
 /* 13D584 8024A244 2404004F */   addiu    $a0, $zero, 0x4f
 /* 13D588 8024A248 3C118027 */  lui       $s1, %hi(gItemMenuCurrentTab)
 /* 13D58C 8024A24C 263105E4 */  addiu     $s1, $s1, %lo(gItemMenuCurrentTab)
@@ -617,7 +617,7 @@ glabel pause_items_draw_contents
 .L8024A27C:
 /* 13D5BC 8024A27C 0040202D */  daddu     $a0, $v0, $zero
 /* 13D5C0 8024A280 AFA00010 */  sw        $zero, 0x10($sp)
-/* 13D5C4 8024A284 0C04993B */  jal       draw_string
+/* 13D5C4 8024A284 0C04993B */  jal       draw_msg
 /* 13D5C8 8024A288 AFB00014 */   sw       $s0, 0x14($sp)
 /* 13D5CC 8024A28C 8E230000 */  lw        $v1, ($s1)
 /* 13D5D0 8024A290 8FA600AC */  lw        $a2, 0xac($sp)
@@ -657,7 +657,7 @@ glabel pause_items_draw_contents
 /* 13D64C 8024A30C AFA20048 */  sw        $v0, 0x48($sp)
 /* 13D650 8024A310 0C03D4B8 */  jal       draw_box
 /* 13D654 8024A314 AFA0004C */   sw       $zero, 0x4c($sp)
-/* 13D658 8024A318 0C093BA0 */  jal       pause_get_menu_string
+/* 13D658 8024A318 0C093BA0 */  jal       pause_get_menu_msg
 /* 13D65C 8024A31C 24040050 */   addiu    $a0, $zero, 0x50
 /* 13D660 8024A320 3C108027 */  lui       $s0, %hi(gItemMenuCurrentTab)
 /* 13D664 8024A324 261005E4 */  addiu     $s0, $s0, %lo(gItemMenuCurrentTab)
@@ -676,7 +676,7 @@ glabel pause_items_draw_contents
 .L8024A354:
 /* 13D694 8024A354 0040202D */  daddu     $a0, $v0, $zero
 /* 13D698 8024A358 AFA00010 */  sw        $zero, 0x10($sp)
-/* 13D69C 8024A35C 0C04993B */  jal       draw_string
+/* 13D69C 8024A35C 0C04993B */  jal       draw_msg
 /* 13D6A0 8024A360 AFA80014 */   sw       $t0, 0x14($sp)
 /* 13D6A4 8024A364 3C038027 */  lui       $v1, %hi(gPauseMenuCurrentTab)
 /* 13D6A8 8024A368 806300D4 */  lb        $v1, %lo(gPauseMenuCurrentTab)($v1)
diff --git a/ver/us/asm/nonmatchings/pause/pause_items/pause_items_handle_input.s b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_handle_input.s
index d59bc5eb4b..610ac28abf 100644
--- a/ver/us/asm/nonmatchings/pause/pause_items/pause_items_handle_input.s
+++ b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_handle_input.s
@@ -265,13 +265,13 @@ glabel pause_items_handle_input
 /* 13DEE0 8024ABA0 3C018008 */  lui       $at, %hi(gItemTable+0x10)
 /* 13DEE4 8024ABA4 00220821 */  addu      $at, $at, $v0
 /* 13DEE8 8024ABA8 8C2278F0 */  lw        $v0, %lo(gItemTable+0x10)($at)
-/* 13DEEC 8024ABAC 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13DEF0 8024ABB0 AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescString)($at)
+/* 13DEEC 8024ABAC 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13DEF0 8024ABB0 AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescMsg)($at)
 /* 13DEF4 8024ABB4 08092AFE */  j         .L8024ABF8
 /* 13DEF8 8024ABB8 00000000 */   nop
 .L8024ABBC:
-/* 13DEFC 8024ABBC 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13DF00 8024ABC0 AC2000C8 */  sw        $zero, %lo(gPauseMenuCurrentDescString)($at)
+/* 13DEFC 8024ABBC 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13DF00 8024ABC0 AC2000C8 */  sw        $zero, %lo(gPauseMenuCurrentDescMsg)($at)
 /* 13DF04 8024ABC4 08092AFC */  j         .L8024ABF0
 /* 13DF08 8024ABC8 00000000 */   nop
 .L8024ABCC:
@@ -281,10 +281,10 @@ glabel pause_items_handle_input
 /* 13DF18 8024ABD8 24040052 */   addiu    $a0, $zero, 0x52
 /* 13DF1C 8024ABDC 24040051 */  addiu     $a0, $zero, 0x51
 .L8024ABE0:
-/* 13DF20 8024ABE0 0C093BA0 */  jal       pause_get_menu_string
+/* 13DF20 8024ABE0 0C093BA0 */  jal       pause_get_menu_msg
 /* 13DF24 8024ABE4 00000000 */   nop
-/* 13DF28 8024ABE8 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescString)
-/* 13DF2C 8024ABEC AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescString)($at)
+/* 13DF28 8024ABE8 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescMsg)
+/* 13DF2C 8024ABEC AC2200C8 */  sw        $v0, %lo(gPauseMenuCurrentDescMsg)($at)
 .L8024ABF0:
 /* 13DF30 8024ABF0 3C018027 */  lui       $at, %hi(gPauseMenuCurrentDescIconScript)
 /* 13DF34 8024ABF4 AC2000CC */  sw        $zero, %lo(gPauseMenuCurrentDescIconScript)($at)
diff --git a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s
index 8a19b7e225..03bc69e21b 100644
--- a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s
+++ b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s
@@ -43,7 +43,7 @@ glabel func_80241B34_DF8534
 /* DF85A0 80241BA0 AFA00018 */  sw        $zero, 0x18($sp)
 /* DF85A4 80241BA4 AFA0001C */  sw        $zero, 0x1c($sp)
 /* DF85A8 80241BA8 8E640000 */  lw        $a0, ($s3)
-/* DF85AC 80241BAC 0C0497DA */  jal       get_string_properties
+/* DF85AC 80241BAC 0C0497DA */  jal       get_msg_properties
 /* DF85B0 80241BB0 24170008 */   addiu    $s7, $zero, 8
 /* DF85B4 80241BB4 24020001 */  addiu     $v0, $zero, 1
 /* DF85B8 80241BB8 AFA00024 */  sw        $zero, 0x24($sp)
@@ -438,7 +438,7 @@ glabel L80241F28_DF8928
 /* DF8B1C 8024211C AFA00018 */  sw        $zero, 0x18($sp)
 /* DF8B20 80242120 AFA0001C */  sw        $zero, 0x1c($sp)
 /* DF8B24 80242124 8E640000 */  lw        $a0, ($s3)
-/* DF8B28 80242128 0C0497DA */  jal       get_string_properties
+/* DF8B28 80242128 0C0497DA */  jal       get_msg_properties
 /* DF8B2C 8024212C 27A7004C */   addiu    $a3, $sp, 0x4c
 /* DF8B30 80242130 8E64000C */  lw        $a0, 0xc($s3)
 /* DF8B34 80242134 8E630038 */  lw        $v1, 0x38($s3)
diff --git a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s
index b31c6aa8c8..0bd8482b2d 100644
--- a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s
+++ b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242358_DF8D58.s
@@ -41,7 +41,7 @@ glabel func_80242358_DF8D58
 /* DF8DE0 802423E0 3C108025 */  lui       $s0, %hi(D_8024F7F0)
 /* DF8DE4 802423E4 2610F7F0 */  addiu     $s0, $s0, %lo(D_8024F7F0)
 /* DF8DE8 802423E8 00052A00 */  sll       $a1, $a1, 8
-/* DF8DEC 802423EC 0C049601 */  jal       dma_load_string
+/* DF8DEC 802423EC 0C049601 */  jal       dma_load_msg
 /* DF8DF0 802423F0 00B02821 */   addu     $a1, $a1, $s0
 /* DF8DF4 802423F4 8E630000 */  lw        $v1, ($s3)
 /* DF8DF8 802423F8 00031200 */  sll       $v0, $v1, 8
@@ -64,7 +64,7 @@ glabel func_80242358_DF8D58
 /* DF8E34 80242434 AFA20018 */  sw        $v0, 0x18($sp)
 /* DF8E38 80242438 AFA0001C */  sw        $zero, 0x1c($sp)
 /* DF8E3C 8024243C 8E240000 */  lw        $a0, ($s1)
-/* DF8E40 80242440 0C0497DA */  jal       get_string_properties
+/* DF8E40 80242440 0C0497DA */  jal       get_msg_properties
 /* DF8E44 80242444 27A70020 */   addiu    $a3, $sp, 0x20
 /* DF8E48 80242448 8E420004 */  lw        $v0, 4($s2)
 /* DF8E4C 8024244C AE220068 */  sw        $v0, 0x68($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s
index 91350bb474..23b1319767 100644
--- a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s
+++ b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s
@@ -43,7 +43,7 @@ glabel func_80241B44_E06EA4
 /* E06F10 80241BB0 AFA00018 */  sw        $zero, 0x18($sp)
 /* E06F14 80241BB4 AFA0001C */  sw        $zero, 0x1c($sp)
 /* E06F18 80241BB8 8E640000 */  lw        $a0, ($s3)
-/* E06F1C 80241BBC 0C0497DA */  jal       get_string_properties
+/* E06F1C 80241BBC 0C0497DA */  jal       get_msg_properties
 /* E06F20 80241BC0 24170008 */   addiu    $s7, $zero, 8
 /* E06F24 80241BC4 24020001 */  addiu     $v0, $zero, 1
 /* E06F28 80241BC8 AFA00024 */  sw        $zero, 0x24($sp)
@@ -438,7 +438,7 @@ glabel L80241F38_E07298
 /* E0748C 8024212C AFA00018 */  sw        $zero, 0x18($sp)
 /* E07490 80242130 AFA0001C */  sw        $zero, 0x1c($sp)
 /* E07494 80242134 8E640000 */  lw        $a0, ($s3)
-/* E07498 80242138 0C0497DA */  jal       get_string_properties
+/* E07498 80242138 0C0497DA */  jal       get_msg_properties
 /* E0749C 8024213C 27A7004C */   addiu    $a3, $sp, 0x4c
 /* E074A0 80242140 8E64000C */  lw        $a0, 0xc($s3)
 /* E074A4 80242144 8E630038 */  lw        $v1, 0x38($s3)
diff --git a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s
index e161ed07b3..9089cf521f 100644
--- a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s
+++ b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s
@@ -41,7 +41,7 @@ glabel func_80242368_E076C8
 /* E07750 802423F0 3C108025 */  lui       $s0, %hi(D_8024A2D0)
 /* E07754 802423F4 2610A2D0 */  addiu     $s0, $s0, %lo(D_8024A2D0)
 /* E07758 802423F8 00052A00 */  sll       $a1, $a1, 8
-/* E0775C 802423FC 0C049601 */  jal       dma_load_string
+/* E0775C 802423FC 0C049601 */  jal       dma_load_msg
 /* E07760 80242400 00B02821 */   addu     $a1, $a1, $s0
 /* E07764 80242404 8E630000 */  lw        $v1, ($s3)
 /* E07768 80242408 00031200 */  sll       $v0, $v1, 8
@@ -64,7 +64,7 @@ glabel func_80242368_E076C8
 /* E077A4 80242444 AFA20018 */  sw        $v0, 0x18($sp)
 /* E077A8 80242448 AFA0001C */  sw        $zero, 0x1c($sp)
 /* E077AC 8024244C 8E240000 */  lw        $a0, ($s1)
-/* E077B0 80242450 0C0497DA */  jal       get_string_properties
+/* E077B0 80242450 0C0497DA */  jal       get_msg_properties
 /* E077B4 80242454 27A70020 */   addiu    $a3, $sp, 0x20
 /* E077B8 80242458 8E420004 */  lw        $v0, 4($s2)
 /* E077BC 8024245C AE220068 */  sw        $v0, 0x68($s1)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s
index 81c547f2dd..6cc283fd34 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s
@@ -158,7 +158,7 @@ glabel L80240D60_A27C30
 /* A27CB4 80240DE4 8C440000 */  lw        $a0, ($v0)
 /* A27CB8 80240DE8 1080000F */  beqz      $a0, .L80240E28
 /* A27CBC 80240DEC 00000000 */   nop
-/* A27CC0 80240DF0 0C04992C */  jal       get_string_lines
+/* A27CC0 80240DF0 0C04992C */  jal       get_msg_lines
 /* A27CC4 80240DF4 0000802D */   daddu    $s0, $zero, $zero
 /* A27CC8 80240DF8 28420002 */  slti      $v0, $v0, 2
 /* A27CCC 80240DFC 50400001 */  beql      $v0, $zero, .L80240E04
@@ -171,7 +171,7 @@ glabel L80240D60_A27C30
 /* A27CE4 80240E14 AFA20010 */  sw        $v0, 0x10($sp)
 /* A27CE8 80240E18 AFA00014 */  sw        $zero, 0x14($sp)
 /* A27CEC 80240E1C 8C640000 */  lw        $a0, ($v1)
-/* A27CF0 80240E20 0C04993B */  jal       draw_string
+/* A27CF0 80240E20 0C04993B */  jal       draw_msg
 /* A27CF4 80240E24 0220382D */   daddu    $a3, $s1, $zero
 .L80240E28:
 /* A27CF8 80240E28 8FBF0034 */  lw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s
index e8591c66d4..cde5b3bcbc 100644
--- a/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s
+++ b/ver/us/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s
@@ -158,7 +158,7 @@ glabel L80244B80_A2EDC0
 /* A2EE44 80244C04 8C440000 */  lw        $a0, ($v0)
 /* A2EE48 80244C08 1080000F */  beqz      $a0, .L80244C48
 /* A2EE4C 80244C0C 00000000 */   nop
-/* A2EE50 80244C10 0C04992C */  jal       get_string_lines
+/* A2EE50 80244C10 0C04992C */  jal       get_msg_lines
 /* A2EE54 80244C14 0000802D */   daddu    $s0, $zero, $zero
 /* A2EE58 80244C18 28420002 */  slti      $v0, $v0, 2
 /* A2EE5C 80244C1C 50400001 */  beql      $v0, $zero, .L80244C24
@@ -171,7 +171,7 @@ glabel L80244B80_A2EDC0
 /* A2EE74 80244C34 AFA20010 */  sw        $v0, 0x10($sp)
 /* A2EE78 80244C38 AFA00014 */  sw        $zero, 0x14($sp)
 /* A2EE7C 80244C3C 8C640000 */  lw        $a0, ($v1)
-/* A2EE80 80244C40 0C04993B */  jal       draw_string
+/* A2EE80 80244C40 0C04993B */  jal       draw_msg
 /* A2EE84 80244C44 0220382D */   daddu    $a3, $s1, $zero
 .L80244C48:
 /* A2EE88 80244C48 8FBF0034 */  lw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s
index 102081b7cc..df99e70e58 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s
@@ -22,7 +22,7 @@ glabel func_802400E4_AF7A34
 /* AF7A78 80240128 00108140 */  sll       $s0, $s0, 5
 /* AF7A7C 8024012C 02028021 */  addu      $s0, $s0, $v0
 /* AF7A80 80240130 8E040000 */  lw        $a0, ($s0)
-/* AF7A84 80240134 0C04991D */  jal       get_string_width
+/* AF7A84 80240134 0C04991D */  jal       get_msg_width
 /* AF7A88 80240138 0000282D */   daddu    $a1, $zero, $zero
 /* AF7A8C 8024013C 00021043 */  sra       $v0, $v0, 1
 /* AF7A90 80240140 2442FFC4 */  addiu     $v0, $v0, -0x3c
@@ -31,7 +31,7 @@ glabel func_802400E4_AF7A34
 /* AF7A9C 8024014C AFA00010 */  sw        $zero, 0x10($sp)
 /* AF7AA0 80240150 AFA00014 */  sw        $zero, 0x14($sp)
 /* AF7AA4 80240154 8E040000 */  lw        $a0, ($s0)
-/* AF7AA8 80240158 0C04993B */  jal       draw_string
+/* AF7AA8 80240158 0C04993B */  jal       draw_msg
 /* AF7AAC 8024015C 240700FF */   addiu    $a3, $zero, 0xff
 /* AF7AB0 80240160 8FBF0024 */  lw        $ra, 0x24($sp)
 /* AF7AB4 80240164 8FB20020 */  lw        $s2, 0x20($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s
index 7c60a64bc8..dd5b6014c7 100644
--- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s
+++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s
@@ -32,7 +32,7 @@ glabel func_80240178_AF7AC8
 /* AF7B30 802401E0 AFA00014 */  sw        $zero, 0x14($sp)
 /* AF7B34 802401E4 8C840014 */  lw        $a0, 0x14($a0)
 .L802401E8:
-/* AF7B38 802401E8 0C04993B */  jal       draw_string
+/* AF7B38 802401E8 0C04993B */  jal       draw_msg
 /* AF7B3C 802401EC 240700FF */   addiu    $a3, $zero, 0xff
 /* AF7B40 802401F0 8FBF0018 */  lw        $ra, 0x18($sp)
 /* AF7B44 802401F4 03E00008 */  jr        $ra
diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s
index 0019fd6ebf..788d7d69cf 100644
--- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s
+++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_802421A0_8EDFC0.s
@@ -114,7 +114,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE144 80242324 2407009B */   addiu    $a3, $zero, 0x9b
 /* 8EE148 80242328 3C04000B */  lui       $a0, 0xb
 /* 8EE14C 8024232C 348400FC */  ori       $a0, $a0, 0xfc
-/* 8EE150 80242330 0C04991D */  jal       get_string_width
+/* 8EE150 80242330 0C04991D */  jal       get_msg_width
 /* 8EE154 80242334 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE158 80242338 3C04000B */  lui       $a0, 0xb
 /* 8EE15C 8024233C 348400FC */  ori       $a0, $a0, 0xfc
@@ -123,7 +123,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE168 80242348 24060032 */  addiu     $a2, $zero, 0x32
 /* 8EE16C 8024234C 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE170 80242350 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE174 80242354 0C04993B */  jal       draw_string
+/* 8EE174 80242354 0C04993B */  jal       draw_msg
 /* 8EE178 80242358 AFB10014 */   sw       $s1, 0x14($sp)
 /* 8EE17C 8024235C 240500D8 */  addiu     $a1, $zero, 0xd8
 /* 8EE180 80242360 24060033 */  addiu     $a2, $zero, 0x33
@@ -138,7 +138,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE1A4 80242384 AFB40018 */   sw       $s4, 0x18($sp)
 /* 8EE1A8 80242388 3C04000B */  lui       $a0, 0xb
 /* 8EE1AC 8024238C 348400FD */  ori       $a0, $a0, 0xfd
-/* 8EE1B0 80242390 0C04991D */  jal       get_string_width
+/* 8EE1B0 80242390 0C04991D */  jal       get_msg_width
 /* 8EE1B4 80242394 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE1B8 80242398 3C04000B */  lui       $a0, 0xb
 /* 8EE1BC 8024239C 348400FD */  ori       $a0, $a0, 0xfd
@@ -146,7 +146,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE1C4 802423A4 24060041 */  addiu     $a2, $zero, 0x41
 /* 8EE1C8 802423A8 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE1CC 802423AC AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE1D0 802423B0 0C04993B */  jal       draw_string
+/* 8EE1D0 802423B0 0C04993B */  jal       draw_msg
 /* 8EE1D4 802423B4 AFB10014 */   sw       $s1, 0x14($sp)
 /* 8EE1D8 802423B8 240500E7 */  addiu     $a1, $zero, 0xe7
 /* 8EE1DC 802423BC 24060042 */  addiu     $a2, $zero, 0x42
@@ -163,7 +163,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE208 802423E8 2406003F */  addiu     $a2, $zero, 0x3f
 /* 8EE20C 802423EC 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE210 802423F0 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE214 802423F4 0C04993B */  jal       draw_string
+/* 8EE214 802423F4 0C04993B */  jal       draw_msg
 /* 8EE218 802423F8 AFA00014 */   sw       $zero, 0x14($sp)
 /* 8EE21C 802423FC 24040050 */  addiu     $a0, $zero, 0x50
 /* 8EE220 80242400 240500F4 */  addiu     $a1, $zero, 0xf4
@@ -181,13 +181,13 @@ glabel func_802421A0_8EDFC0
 /* 8EE250 80242430 24060050 */  addiu     $a2, $zero, 0x50
 /* 8EE254 80242434 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE258 80242438 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE25C 8024243C 0C04993B */  jal       draw_string
+/* 8EE25C 8024243C 0C04993B */  jal       draw_msg
 /* 8EE260 80242440 AFB10014 */   sw       $s1, 0x14($sp)
 /* 8EE264 80242444 08090937 */  j         .L802424DC
 /* 8EE268 80242448 3C04000B */   lui      $a0, 0xb
 .L8024244C:
 /* 8EE26C 8024244C 348400FB */  ori       $a0, $a0, 0xfb
-/* 8EE270 80242450 0C04991D */  jal       get_string_width
+/* 8EE270 80242450 0C04991D */  jal       get_msg_width
 /* 8EE274 80242454 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE278 80242458 3C04000B */  lui       $a0, 0xb
 /* 8EE27C 8024245C 348400FB */  ori       $a0, $a0, 0xfb
@@ -195,7 +195,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE284 80242464 24060050 */  addiu     $a2, $zero, 0x50
 /* 8EE288 80242468 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE28C 8024246C AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE290 80242470 0C04993B */  jal       draw_string
+/* 8EE290 80242470 0C04993B */  jal       draw_msg
 /* 8EE294 80242474 AFB10014 */   sw       $s1, 0x14($sp)
 /* 8EE298 80242478 240500E7 */  addiu     $a1, $zero, 0xe7
 /* 8EE29C 8024247C 24060051 */  addiu     $a2, $zero, 0x51
@@ -211,7 +211,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE2C4 802424A4 2406004E */  addiu     $a2, $zero, 0x4e
 /* 8EE2C8 802424A8 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE2CC 802424AC AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE2D0 802424B0 0C04993B */  jal       draw_string
+/* 8EE2D0 802424B0 0C04993B */  jal       draw_msg
 /* 8EE2D4 802424B4 AFA00014 */   sw       $zero, 0x14($sp)
 /* 8EE2D8 802424B8 240400A0 */  addiu     $a0, $zero, 0xa0
 /* 8EE2DC 802424BC 240500F4 */  addiu     $a1, $zero, 0xf4
@@ -224,7 +224,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE2F8 802424D8 3C04000B */  lui       $a0, 0xb
 .L802424DC:
 /* 8EE2FC 802424DC 348400FE */  ori       $a0, $a0, 0xfe
-/* 8EE300 802424E0 0C04991D */  jal       get_string_width
+/* 8EE300 802424E0 0C04991D */  jal       get_msg_width
 /* 8EE304 802424E4 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE308 802424E8 86C40026 */  lh        $a0, 0x26($s6)
 /* 8EE30C 802424EC 1480000C */  bnez      $a0, .L80242520
@@ -236,7 +236,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE324 80242504 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE328 80242508 24020001 */  addiu     $v0, $zero, 1
 /* 8EE32C 8024250C AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE330 80242510 0C04993B */  jal       draw_string
+/* 8EE330 80242510 0C04993B */  jal       draw_msg
 /* 8EE334 80242514 AFA20014 */   sw       $v0, 0x14($sp)
 /* 8EE338 80242518 0809097C */  j         .L802425F0
 /* 8EE33C 8024251C 00000000 */   nop
@@ -251,7 +251,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE35C 8024253C 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE360 80242540 24020001 */  addiu     $v0, $zero, 1
 /* 8EE364 80242544 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE368 80242548 0C04993B */  jal       draw_string
+/* 8EE368 80242548 0C04993B */  jal       draw_msg
 /* 8EE36C 8024254C AFA20014 */   sw       $v0, 0x14($sp)
 /* 8EE370 80242550 0000202D */  daddu     $a0, $zero, $zero
 /* 8EE374 80242554 240500E7 */  addiu     $a1, $zero, 0xe7
@@ -266,7 +266,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE394 80242574 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE398 80242578 24020001 */  addiu     $v0, $zero, 1
 /* 8EE39C 8024257C AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE3A0 80242580 0C04993B */  jal       draw_string
+/* 8EE3A0 80242580 0C04993B */  jal       draw_msg
 /* 8EE3A4 80242584 AFA20014 */   sw       $v0, 0x14($sp)
 /* 8EE3A8 80242588 240500E7 */  addiu     $a1, $zero, 0xe7
 /* 8EE3AC 8024258C 24060060 */  addiu     $a2, $zero, 0x60
@@ -284,7 +284,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE3D8 802425B8 2406005D */  addiu     $a2, $zero, 0x5d
 /* 8EE3DC 802425BC 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE3E0 802425C0 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE3E4 802425C4 0C04993B */  jal       draw_string
+/* 8EE3E4 802425C4 0C04993B */  jal       draw_msg
 /* 8EE3E8 802425C8 AFA00014 */   sw       $zero, 0x14($sp)
 /* 8EE3EC 802425CC 240500F4 */  addiu     $a1, $zero, 0xf4
 /* 8EE3F0 802425D0 2406005F */  addiu     $a2, $zero, 0x5f
@@ -307,13 +307,13 @@ glabel func_802421A0_8EDFC0
 /* 8EE430 80242610 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE434 80242614 24020001 */  addiu     $v0, $zero, 1
 /* 8EE438 80242618 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE43C 8024261C 0C04993B */  jal       draw_string
+/* 8EE43C 8024261C 0C04993B */  jal       draw_msg
 /* 8EE440 80242620 AFA20014 */   sw       $v0, 0x14($sp)
 /* 8EE444 80242624 080909B3 */  j         .L802426CC
 /* 8EE448 80242628 3C04000B */   lui      $a0, 0xb
 .L8024262C:
 /* 8EE44C 8024262C 348400FF */  ori       $a0, $a0, 0xff
-/* 8EE450 80242630 0C04991D */  jal       get_string_width
+/* 8EE450 80242630 0C04991D */  jal       get_msg_width
 /* 8EE454 80242634 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE458 80242638 3C04000B */  lui       $a0, 0xb
 /* 8EE45C 8024263C 348400FF */  ori       $a0, $a0, 0xff
@@ -323,7 +323,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE46C 8024264C 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE470 80242650 24020001 */  addiu     $v0, $zero, 1
 /* 8EE474 80242654 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE478 80242658 0C04993B */  jal       draw_string
+/* 8EE478 80242658 0C04993B */  jal       draw_msg
 /* 8EE47C 8024265C AFA20014 */   sw       $v0, 0x14($sp)
 /* 8EE480 80242660 240500E7 */  addiu     $a1, $zero, 0xe7
 /* 8EE484 80242664 2406006F */  addiu     $a2, $zero, 0x6f
@@ -340,7 +340,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE4B0 80242690 2406006C */  addiu     $a2, $zero, 0x6c
 /* 8EE4B4 80242694 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE4B8 80242698 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE4BC 8024269C 0C04993B */  jal       draw_string
+/* 8EE4BC 8024269C 0C04993B */  jal       draw_msg
 /* 8EE4C0 802426A0 AFA00014 */   sw       $zero, 0x14($sp)
 /* 8EE4C4 802426A4 240500F4 */  addiu     $a1, $zero, 0xf4
 /* 8EE4C8 802426A8 2406006F */  addiu     $a2, $zero, 0x6f
@@ -354,7 +354,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE4E8 802426C8 3C04000B */  lui       $a0, 0xb
 .L802426CC:
 /* 8EE4EC 802426CC 348400F4 */  ori       $a0, $a0, 0xf4
-/* 8EE4F0 802426D0 0C04991D */  jal       get_string_width
+/* 8EE4F0 802426D0 0C04991D */  jal       get_msg_width
 /* 8EE4F4 802426D4 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE4F8 802426D8 3C04000B */  lui       $a0, 0xb
 /* 8EE4FC 802426DC 348400F4 */  ori       $a0, $a0, 0xf4
@@ -364,7 +364,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE50C 802426EC 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE510 802426F0 24120001 */  addiu     $s2, $zero, 1
 /* 8EE514 802426F4 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE518 802426F8 0C04993B */  jal       draw_string
+/* 8EE518 802426F8 0C04993B */  jal       draw_msg
 /* 8EE51C 802426FC AFB20014 */   sw       $s2, 0x14($sp)
 /* 8EE520 80242700 240500D8 */  addiu     $a1, $zero, 0xd8
 /* 8EE524 80242704 2406007E */  addiu     $a2, $zero, 0x7e
@@ -379,7 +379,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE548 80242728 AFB30018 */   sw       $s3, 0x18($sp)
 /* 8EE54C 8024272C 3C04000B */  lui       $a0, 0xb
 /* 8EE550 80242730 348400F7 */  ori       $a0, $a0, 0xf7
-/* 8EE554 80242734 0C04991D */  jal       get_string_width
+/* 8EE554 80242734 0C04991D */  jal       get_msg_width
 /* 8EE558 80242738 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE55C 8024273C 3C04000B */  lui       $a0, 0xb
 /* 8EE560 80242740 348400F7 */  ori       $a0, $a0, 0xf7
@@ -387,7 +387,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE568 80242748 2406008C */  addiu     $a2, $zero, 0x8c
 /* 8EE56C 8024274C 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE570 80242750 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE574 80242754 0C04993B */  jal       draw_string
+/* 8EE574 80242754 0C04993B */  jal       draw_msg
 /* 8EE578 80242758 AFB20014 */   sw       $s2, 0x14($sp)
 /* 8EE57C 8024275C 240500D8 */  addiu     $a1, $zero, 0xd8
 /* 8EE580 80242760 2406008D */  addiu     $a2, $zero, 0x8d
@@ -399,7 +399,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE598 80242778 AFB30018 */   sw       $s3, 0x18($sp)
 /* 8EE59C 8024277C 3C04000B */  lui       $a0, 0xb
 /* 8EE5A0 80242780 348400F8 */  ori       $a0, $a0, 0xf8
-/* 8EE5A4 80242784 0C04991D */  jal       get_string_width
+/* 8EE5A4 80242784 0C04991D */  jal       get_msg_width
 /* 8EE5A8 80242788 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE5AC 8024278C 3C04000B */  lui       $a0, 0xb
 /* 8EE5B0 80242790 348400F8 */  ori       $a0, $a0, 0xf8
@@ -407,7 +407,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE5B8 80242798 2406009B */  addiu     $a2, $zero, 0x9b
 /* 8EE5BC 8024279C 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE5C0 802427A0 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE5C4 802427A4 0C04993B */  jal       draw_string
+/* 8EE5C4 802427A4 0C04993B */  jal       draw_msg
 /* 8EE5C8 802427A8 AFB20014 */   sw       $s2, 0x14($sp)
 /* 8EE5CC 802427AC 240500D8 */  addiu     $a1, $zero, 0xd8
 /* 8EE5D0 802427B0 2406009C */  addiu     $a2, $zero, 0x9c
@@ -425,13 +425,13 @@ glabel func_802421A0_8EDFC0
 /* 8EE600 802427E0 240600AA */  addiu     $a2, $zero, 0xaa
 /* 8EE604 802427E4 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE608 802427E8 AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE60C 802427EC 0C04993B */  jal       draw_string
+/* 8EE60C 802427EC 0C04993B */  jal       draw_msg
 /* 8EE610 802427F0 AFB20014 */   sw       $s2, 0x14($sp)
 /* 8EE614 802427F4 08090A12 */  j         .L80242848
 /* 8EE618 802427F8 00000000 */   nop
 .L802427FC:
 /* 8EE61C 802427FC 348400F9 */  ori       $a0, $a0, 0xf9
-/* 8EE620 80242800 0C04991D */  jal       get_string_width
+/* 8EE620 80242800 0C04991D */  jal       get_msg_width
 /* 8EE624 80242804 0000282D */   daddu    $a1, $zero, $zero
 /* 8EE628 80242808 3C04000B */  lui       $a0, 0xb
 /* 8EE62C 8024280C 348400F9 */  ori       $a0, $a0, 0xf9
@@ -439,7 +439,7 @@ glabel func_802421A0_8EDFC0
 /* 8EE634 80242814 240600AA */  addiu     $a2, $zero, 0xaa
 /* 8EE638 80242818 0200382D */  daddu     $a3, $s0, $zero
 /* 8EE63C 8024281C AFA00010 */  sw        $zero, 0x10($sp)
-/* 8EE640 80242820 0C04993B */  jal       draw_string
+/* 8EE640 80242820 0C04993B */  jal       draw_msg
 /* 8EE644 80242824 AFB20014 */   sw       $s2, 0x14($sp)
 /* 8EE648 80242828 240500D8 */  addiu     $a1, $zero, 0xd8
 /* 8EE64C 8024282C 240600AB */  addiu     $a2, $zero, 0xab
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s
index 21bcda3d4c..bdee24ed57 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s
@@ -116,7 +116,7 @@ glabel func_802411E0_E0F980
 /* E0FB0C 8024136C 24060039 */  addiu     $a2, $zero, 0x39
 /* E0FB10 80241370 0240382D */  daddu     $a3, $s2, $zero
 /* E0FB14 80241374 AFB00010 */  sw        $s0, 0x10($sp)
-/* E0FB18 80241378 0C04993B */  jal       draw_string
+/* E0FB18 80241378 0C04993B */  jal       draw_msg
 /* E0FB1C 8024137C AFA00014 */   sw       $zero, 0x14($sp)
 /* E0FB20 80241380 240500DB */  addiu     $a1, $zero, 0xdb
 /* E0FB24 80241384 2406004E */  addiu     $a2, $zero, 0x4e
@@ -147,7 +147,7 @@ glabel func_802411E0_E0F980
 /* E0FB84 802413E4 24060039 */  addiu     $a2, $zero, 0x39
 /* E0FB88 802413E8 0240382D */  daddu     $a3, $s2, $zero
 /* E0FB8C 802413EC AFB00010 */  sw        $s0, 0x10($sp)
-/* E0FB90 802413F0 0C04993B */  jal       draw_string
+/* E0FB90 802413F0 0C04993B */  jal       draw_msg
 /* E0FB94 802413F4 AFA00014 */   sw       $zero, 0x14($sp)
 /* E0FB98 802413F8 240500DB */  addiu     $a1, $zero, 0xdb
 /* E0FB9C 802413FC 2406004E */  addiu     $a2, $zero, 0x4e
@@ -184,7 +184,7 @@ glabel func_802411E0_E0F980
 /* E0FC14 80241474 0240382D */  daddu     $a3, $s2, $zero
 /* E0FC18 80241478 24100001 */  addiu     $s0, $zero, 1
 /* E0FC1C 8024147C AFA00010 */  sw        $zero, 0x10($sp)
-/* E0FC20 80241480 0C04993B */  jal       draw_string
+/* E0FC20 80241480 0C04993B */  jal       draw_msg
 /* E0FC24 80241484 AFB00014 */   sw       $s0, 0x14($sp)
 /* E0FC28 80241488 3C040008 */  lui       $a0, 8
 /* E0FC2C 8024148C 34840023 */  ori       $a0, $a0, 0x23
@@ -192,7 +192,7 @@ glabel func_802411E0_E0F980
 /* E0FC34 80241494 2406004E */  addiu     $a2, $zero, 0x4e
 /* E0FC38 80241498 0240382D */  daddu     $a3, $s2, $zero
 /* E0FC3C 8024149C AFA00010 */  sw        $zero, 0x10($sp)
-/* E0FC40 802414A0 0C04993B */  jal       draw_string
+/* E0FC40 802414A0 0C04993B */  jal       draw_msg
 /* E0FC44 802414A4 AFB00014 */   sw       $s0, 0x14($sp)
 /* E0FC48 802414A8 3C040008 */  lui       $a0, 8
 /* E0FC4C 802414AC 3484001F */  ori       $a0, $a0, 0x1f
@@ -200,7 +200,7 @@ glabel func_802411E0_E0F980
 /* E0FC54 802414B4 2406005D */  addiu     $a2, $zero, 0x5d
 /* E0FC58 802414B8 0240382D */  daddu     $a3, $s2, $zero
 /* E0FC5C 802414BC AFA00010 */  sw        $zero, 0x10($sp)
-/* E0FC60 802414C0 0C04993B */  jal       draw_string
+/* E0FC60 802414C0 0C04993B */  jal       draw_msg
 /* E0FC64 802414C4 AFB00014 */   sw       $s0, 0x14($sp)
 /* E0FC68 802414C8 3C040008 */  lui       $a0, 8
 /* E0FC6C 802414CC 34840021 */  ori       $a0, $a0, 0x21
@@ -208,7 +208,7 @@ glabel func_802411E0_E0F980
 /* E0FC74 802414D4 2406005D */  addiu     $a2, $zero, 0x5d
 /* E0FC78 802414D8 0240382D */  daddu     $a3, $s2, $zero
 /* E0FC7C 802414DC AFA00010 */  sw        $zero, 0x10($sp)
-/* E0FC80 802414E0 0C04993B */  jal       draw_string
+/* E0FC80 802414E0 0C04993B */  jal       draw_msg
 /* E0FC84 802414E4 AFB00014 */   sw       $s0, 0x14($sp)
 /* E0FC88 802414E8 3C040008 */  lui       $a0, 8
 /* E0FC8C 802414EC 34840020 */  ori       $a0, $a0, 0x20
@@ -216,7 +216,7 @@ glabel func_802411E0_E0F980
 /* E0FC94 802414F4 2406006C */  addiu     $a2, $zero, 0x6c
 /* E0FC98 802414F8 0240382D */  daddu     $a3, $s2, $zero
 /* E0FC9C 802414FC AFA00010 */  sw        $zero, 0x10($sp)
-/* E0FCA0 80241500 0C04993B */  jal       draw_string
+/* E0FCA0 80241500 0C04993B */  jal       draw_msg
 /* E0FCA4 80241504 AFB00014 */   sw       $s0, 0x14($sp)
 /* E0FCA8 80241508 3C040008 */  lui       $a0, 8
 /* E0FCAC 8024150C 34840021 */  ori       $a0, $a0, 0x21
@@ -224,7 +224,7 @@ glabel func_802411E0_E0F980
 /* E0FCB4 80241514 2406006C */  addiu     $a2, $zero, 0x6c
 /* E0FCB8 80241518 0240382D */  daddu     $a3, $s2, $zero
 /* E0FCBC 8024151C AFA00010 */  sw        $zero, 0x10($sp)
-/* E0FCC0 80241520 0C04993B */  jal       draw_string
+/* E0FCC0 80241520 0C04993B */  jal       draw_msg
 /* E0FCC4 80241524 AFB00014 */   sw       $s0, 0x14($sp)
 .L80241528:
 /* E0FCC8 80241528 8FBF0034 */  lw        $ra, 0x34($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s
index 43911b3216..4c89c8e07a 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416F8_E13E58.s
@@ -22,7 +22,7 @@ glabel func_802416F8_E13E58
 /* E13E9C 8024173C 3C048015 */  lui       $a0, %hi(MessageSingular)
 /* E13EA0 80241740 2484C294 */  addiu     $a0, $a0, %lo(MessageSingular)
 .L80241744:
-/* E13EA4 80241744 0C0496CF */  jal       set_message_string
+/* E13EA4 80241744 0C0496CF */  jal       set_message_msg
 /* E13EA8 80241748 24050001 */   addiu    $a1, $zero, 1
 /* E13EAC 8024174C 8FBF0014 */  lw        $ra, 0x14($sp)
 /* E13EB0 80241750 8FB00010 */  lw        $s0, 0x10($sp)
diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s
index c20dbb52b8..ccc6c01931 100644
--- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s
+++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240000_E15D80.s
@@ -155,7 +155,7 @@ glabel func_80240000_E15D80
 /* E15F9C 8024021C 240700FF */  addiu     $a3, $zero, 0xff
 /* E15FA0 80240220 AFA00010 */  sw        $zero, 0x10($sp)
 /* E15FA4 80240224 AFA00014 */  sw        $zero, 0x14($sp)
-/* E15FA8 80240228 0C04993B */  jal       draw_string
+/* E15FA8 80240228 0C04993B */  jal       draw_msg
 /* E15FAC 8024022C 24A5002A */   addiu    $a1, $a1, 0x2a
 /* E15FB0 80240230 2406002B */  addiu     $a2, $zero, 0x2b
 /* E15FB4 80240234 24070001 */  addiu     $a3, $zero, 1
@@ -274,7 +274,7 @@ glabel func_80240000_E15D80
 /* E16174 802403F4 240700FF */  addiu     $a3, $zero, 0xff
 /* E16178 802403F8 AFA00010 */  sw        $zero, 0x10($sp)
 /* E1617C 802403FC AFA00014 */  sw        $zero, 0x14($sp)
-/* E16180 80240400 0C04993B */  jal       draw_string
+/* E16180 80240400 0C04993B */  jal       draw_msg
 /* E16184 80240404 24A5001E */   addiu    $a1, $a1, 0x1e
 /* E16188 80240408 8FBF006C */  lw        $ra, 0x6c($sp)
 /* E1618C 8024040C 8FB60068 */  lw        $s6, 0x68($sp)
diff --git a/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopOwnerDialog.s b/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopOwnerDialog.s
index 24e3a96967..c4bab492a9 100644
--- a/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopOwnerDialog.s
+++ b/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopOwnerDialog.s
@@ -538,7 +538,7 @@ glabel ShowShopOwnerDialog
 /* 7E21D0 80281350 24020049 */  addiu     $v0, $zero, 0x49
 .L80281354:
 /* 7E21D4 80281354 AE220070 */  sw        $v0, 0x70($s1)
-/* 7E21D8 80281358 0C049640 */  jal       msg_get_printer_for_string
+/* 7E21D8 80281358 0C049640 */  jal       msg_get_printer_for_msg
 /* 7E21DC 8028135C AE200078 */   sw       $zero, 0x78($s1)
 /* 7E21E0 80281360 3C018028 */  lui       $at, %hi(D_80286538)
 /* 7E21E4 80281364 AC226538 */  sw        $v0, %lo(D_80286538)($at)
diff --git a/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopPurchaseDialog.s b/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopPurchaseDialog.s
index 257fa23826..5447063a53 100644
--- a/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopPurchaseDialog.s
+++ b/ver/us/asm/nonmatchings/world/script_api/7E0E80/ShowShopPurchaseDialog.s
@@ -110,7 +110,7 @@ glabel ShowShopPurchaseDialog
 /* 7E1528 802806A8 26650078 */  addiu     $a1, $s3, 0x78
 /* 7E152C 802806AC 24020064 */  addiu     $v0, $zero, 0x64
 /* 7E1530 802806B0 AE620070 */  sw        $v0, 0x70($s3)
-/* 7E1534 802806B4 0C049640 */  jal       msg_get_printer_for_string
+/* 7E1534 802806B4 0C049640 */  jal       msg_get_printer_for_msg
 /* 7E1538 802806B8 AE600078 */   sw       $zero, 0x78($s3)
 /* 7E153C 802806BC 3C018028 */  lui       $at, %hi(D_80286528)
 /* 7E1540 802806C0 AC226528 */  sw        $v0, %lo(D_80286528)($at)
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 60dbabec7d..58f5732979 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -408,7 +408,7 @@ GetEncounterTriggerHitTier = 0x8004580C; // type:func rom:0x20C0C
 func_80045838 = 0x80045838; // type:func rom:0x20C38
 func_800458CC = 0x800458CC; // type:func rom:0x20CCC
 func_80045900 = 0x80045900; // type:func rom:0x20D00
-SetTattleString = 0x80045A58; // type:func rom:0x20E58
+SetTattleMsg = 0x80045A58; // type:func rom:0x20E58
 func_80045AC0 = 0x80045AC0; // type:func rom:0x20EC0
 func_80045B10 = 0x80045B10; // type:func rom:0x20F10
 update_merlee_messages = 0x80045B68; // type:func rom:0x20F68
@@ -1309,7 +1309,7 @@ D_800743E0 = 0x800743E0; // type:data rom:0x4F7E0
 gRandSeed = 0x80074410; // rom:0x4F810
 D_80074414 = 0x80074414; // type:data rom:0x4F814
 D_80074580 = 0x80074580; // type:data rom:0x4F980
-magicSaveString = 0x800745D0; // type:data rom:0x4F9D0
+magicSaveMsg = 0x800745D0; // type:data rom:0x4F9D0
 sprite_unk_checkers_png = 0x800745E0; // type:data rom:0x4F9E0
 D_800746E0 = 0x800746E0; // type:data rom:0x4FAE0
 sprite_curtains_png = 0x80074730; // type:data rom:0x4FB30
@@ -1391,7 +1391,7 @@ D_80077A34 = 0x80077A34; // type:data rom:0x52E34
 D_80077A40 = 0x80077A40; // type:data rom:0x52E40
 D_80077A50 = 0x80077A50; // type:data rom:0x52E50
 D_80077AE0 = 0x80077AE0; // type:data rom:0x52EE0
-versionString = 0x80077BD0; // type:data rom:0x52FD0
+versionMsg = 0x80077BD0; // type:data rom:0x52FD0
 SCRIPT_NpcDefeat = 0x80077E38; // rom:0x53238
 D_80078170 = 0x80078170; // type:data rom:0x53570
 nuAuPreNMIFunc = 0x80078174; // rom:0x53574
@@ -2197,23 +2197,23 @@ render_messages = 0x80124204; // type:func rom:0xBA904
 msg_play_speech_sound = 0x80124434; // type:func rom:0xBAB34
 msg_copy_to_print_buffer = 0x80124570; // type:func rom:0xBAC70
 initialize_printer = 0x801256A4; // type:func rom:0xBBDA4
-dma_load_string = 0x80125804; // type:func rom:0xBBF04
+dma_load_msg = 0x80125804; // type:func rom:0xBBF04
 load_message_to_buffer = 0x8012588C; // type:func rom:0xBBF8C
-msg_get_printer_for_string = 0x80125900; // type:func rom:0xBC000
-_msg_get_printer_for_string = 0x8012591C; // type:func rom:0xBC01C
-msg_printer_load_string = 0x80125A68; // type:func rom:0xBC168
+msg_get_printer_for_msg = 0x80125900; // type:func rom:0xBC000
+_msg_get_printer_for_msg = 0x8012591C; // type:func rom:0xBC01C
+msg_printer_load_msg = 0x80125A68; // type:func rom:0xBC168
 msg_printer_set_origin_pos = 0x80125AB8; // type:func rom:0xBC1B8
 cancel_message = 0x80125B08; // type:func rom:0xBC208
 set_message_images = 0x80125B2C; // type:func rom:0xBC22C
-set_message_string = 0x80125B3C; // type:func rom:0xBC23C
+set_message_msg = 0x80125B3C; // type:func rom:0xBC23C
 set_message_value = 0x80125BE8; // type:func rom:0xBC2E8
 close_message = 0x80125C70; // type:func rom:0xBC370
 msg_get_print_char_width = 0x80125C84; // type:func rom:0xBC384
 msg_get_draw_char_width = 0x80125DF4; // type:func rom:0xBC4F4
-get_string_properties = 0x80125F68; // type:func rom:0xBC668
-get_string_width = 0x80126474; // type:func rom:0xBCB74
-get_string_lines = 0x801264B0; // type:func rom:0xBCBB0
-draw_string = 0x801264EC; // type:func rom:0xBCBEC
+get_msg_properties = 0x80125F68; // type:func rom:0xBC668
+get_msg_width = 0x80126474; // type:func rom:0xBCB74
+get_msg_lines = 0x801264B0; // type:func rom:0xBCBB0
+draw_msg = 0x801264EC; // type:func rom:0xBCBEC
 msg_update_rewind_arrow = 0x80126790; // type:func rom:0xBCE90
 msg_draw_rewind_arrow = 0x80126EAC; // type:func rom:0xBD5AC
 msg_draw_choice_pointer = 0x80126F78; // type:func rom:0xBD678
@@ -3084,7 +3084,7 @@ CancelMessage = 0x802D0C20; // type:func rom:0xF55D0
 CancelMessageAndBlock = 0x802D0C48; // type:func rom:0xF55F8
 SetMessageImages = 0x802D0C70; // type:func rom:0xF5620
 func_802D0C94 = 0x802D0C94; // type:func rom:0xF5644
-SetMessageString = 0x802D0CEC; // type:func rom:0xF569C
+SetMessageMsg = 0x802D0CEC; // type:func rom:0xF569C
 SetMessageValue = 0x802D0D44; // type:func rom:0xF56F4
 HidePlayerShadow = 0x802D0DA0; // type:func rom:0xF5750
 DisablePlayerPhysics = 0x802D0DE4; // type:func rom:0xF5794
@@ -3706,7 +3706,7 @@ pause_map_init = 0x8024E604; // type:func rom:0x141944
 pause_map_handle_input = 0x8024E878; // type:func rom:0x141BB8
 pause_map_update = 0x8024ECB0; // type:func rom:0x141FF0
 pause_map_cleanup = 0x8024EE2C; // type:func rom:0x14216C
-pause_get_menu_string = 0x8024EE80; // type:func rom:0x1421C0
+pause_get_menu_msg = 0x8024EE80; // type:func rom:0x1421C0
 pause_draw_menu_label = 0x8024EE94; // type:func rom:0x1421D4
 gPauseMenuIconScripts = 0x8024EF60; // type:data rom:0x1422A0
 gPauseMenuCursorPosX = 0x8024EF9C; // rom:0x1422DC
@@ -18985,7 +18985,7 @@ gBattleDynamicEntityList = 0x801543E0; //
 gCurrentDynamicEntityListPtr = 0x80154420; //
 gMessageBuffers = 0x80154430; // type:data
 gMessagePrinters = 0x80154C30; // size:0x1008
-gMessageStringVars = 0x80155C38; // type:data
+gMessageMsgVars = 0x80155C38; // type:data
 D_80155C98 = 0x80155C98; // type:data
 gMessageWindowProjMatrix = 0x80155CA0; // type:data
 D_80155D20 = 0x80155D20; // type:data
@@ -19749,7 +19749,7 @@ D_8026F2A0 = 0x8026F2A0; // type:data
 D_8026F348 = 0x8026F348; // type:data
 D_8026F5A0 = 0x8026F5A0; // type:data
 D_8026F778 = 0x8026F778; // type:data
-gPauseMenuStrings = 0x8026F778; // type:data
+gPauseMenuMsgs = 0x8026F778; // type:data
 D_8026F8D4 = 0x8026F8D4; // type:data
 D_8026FB30 = 0x8026FB30; // type:data
 D_8026FBD8 = 0x8026FBD8; // type:data
@@ -19777,7 +19777,7 @@ D_80270068 = 0x80270068; // type:data
 D_80270070 = 0x80270070; // type:data
 gPauseMenuHeldButtons = 0x802700C0; // type:data
 gPauseMenuPressedButtons = 0x802700C4; // type:data
-gPauseMenuCurrentDescString = 0x802700C8; // type:data
+gPauseMenuCurrentDescMsg = 0x802700C8; // type:data
 gPauseMenuCurrentDescIconScript = 0x802700CC; // type:data
 D_802700D0 = 0x802700D0; // type:data
 gPauseMenuCurrentTab = 0x802700D4; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index c2acf0684c..4580086d86 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -37,7 +37,7 @@ func_80242040_8B20B0 = 0x80242040;
 spiked_goomba = 0x8021B0AC;
 paragoomba = 0x8021CD00;
 D_802C05CC = 0x802C05CC;
-gPauseMenuStrings = 0x8026F778;
+gPauseMenuMsgs = 0x8026F778;
 D_802442D0 = 0x802442D0;
 D_80097E30 = 0x80097E30;
 D_802AB513 = 0x802AB513;
@@ -208,7 +208,7 @@ gBattleDynamicEntityList = 0x801543E0;
 gCurrentDynamicEntityListPtr = 0x80154420;
 gMessageBuffers = 0x80154430;
 gMessagePrinters = 0x80154C30;
-gMessageStringVars = 0x80155C38;
+gMessageMsgVars = 0x80155C38;
 D_80155C98 = 0x80155C98;
 gMessageWindowProjMatrix = 0x80155CA0;
 D_80155D20 = 0x80155D20;