Map funcs (#811)

* Many duplicate funcs, still around 41 left :P

* 19 duplicate funcs left

* Finished matching some duplicate funcs in world/area

* wipperz

* hos_01 funcs

* more funx

* 3 hos_04 funcs

* hos_04 funcs

* more hos

* tik_25 func

* mores

* progress

* clean

* mo

* meep

* PRs

Co-authored-by: Nasina7 <nasina987@gmail.com>

include/common_structs.h

@@ -173,6 +173,25 @@ typedef struct NpcQuizmoBlur {
     /* 0x04 */ char unk_04[0x4];
 } NpcQuizmoBlur; // size = 0x8;
 
+typedef struct Unk2A4Part {
+    /* 0x00 */ s8 unk_00;
+    /* 0x01 */ char unk_01[0x3];
+    /* 0x04 */ Vec3f pos;
+} Unk2A4Part; // size = 0x10
+
+typedef struct Unk2A4Blur {
+    /* 0x000 */ Unk2A4Part unk_00[40];
+    /* 0x280 */ s32 partIdx;
+    /* 0x284 */ s32 unk_284;
+    /* 0x288 */ s32 unk_288;
+    /* 0x28C */ s32 npcID;
+    /* 0x290 */ s32* animIDs;
+    /* 0x294 */ f32 unk_294;
+    /* 0x298 */ f32 unk_298;
+    /* 0x29C */ f32 unk_29C;
+    /* 0x2A0 */ f32 unk_2A0;
+} Unk2A4Blur; // size = 0x2A4
+
 typedef struct Npc {
     /* 0x000 */ s32 flags;
     /* 0x004 */ void (*onUpdate)(struct Npc*); ///< Run before anything else for this NPC in update_npcs()
@@ -187,6 +206,7 @@ typedef struct Npc {
                 NpcMotionBlur* motion; ///< Null unless flag 0x100000 is set.
                 NpcChompBlur*  chomp;
                 NpcQuizmoBlur* quizmo;
+                Unk2A4Blur*    unk2A4;
                 } blur;
     /* 0x024 */ s32 spriteInstanceID;
     /* 0x028 */ AnimID currentAnim;
@@ -910,7 +930,9 @@ typedef struct BattleStatus {
     /* 0x1A6 */ s8 currentTargetPart2;
     /* 0x1A7 */ s8 battlePhase;
     /* 0x1A8 */ s16 attackerActorID;
-    /* 0x1AA */ char unk_1AA[4];
+    /* 0x1AA */ s16 unk_1AA;
+    /* 0x1AC */ s8 unk_1AC;
+    /* 0x1AD */ char unk_1AD;
     /* 0x1AE */ s16 submenuIcons[24]; /* icon IDs */
     /* 0x1DE */ u8 submenuMoves[24]; /* move IDs */
     /* 0x1F6 */ s8 submenuStatus[24]; ///< @see enum BattleSubmenuStatus

include/dead.h

@@ -5,6 +5,7 @@
 #define evt_get_variable dead_evt_get_variable
 #define evt_set_variable dead_evt_set_variable
 #define evt_get_float_variable dead_evt_get_float_variable
+#define sin_rad dead_sin_rad
 #define cos_rad dead_cos_rad
 #define evt_set_float_variable dead_evt_set_float_variable
 #define fx_sparkles dead_fx_sparkles
@@ -71,7 +72,7 @@
 #define sfx_play_sound_with_params dead_sfx_play_sound_with_params
 #define sfx_get_spatialized_sound_params dead_sfx_get_spatialized_sound_params
 #define npc_test_move_simple_without_slipping dead_npc_test_move_simple_without_slipping
-#define func_8003D660 func_80041080
+#define func_8003D660 dead_func_8003D660
 #define get_item_entity dead_get_item_entity
 #define gOverrideFlags dead_gOverrideFlags
 #define set_message_msg dead_set_message_msg
@@ -112,5 +113,11 @@
 #define osVirtualToPhysical dead_osVirtualToPhysical
 #define nuGfxZBuffer dead_nuGfxZBuffer
 #define nuGfxCfb_ptr dead_nuGfxCfb_ptr
+#define guMtxF2L dead_guMtxF2L
+#define mdl_get_copied_vertices dead_mdl_get_copied_vertices
+#define mdl_get_copied_gfx dead_mdl_get_copied_gfx
+#define gMatrixListPos dead_gMatrixListPos
+#define gDisplayContext dead_gDisplayContext
+#define fx_sun_undeclared fx_sun
 
 #endif

include/enums.h

@@ -784,6 +784,7 @@ enum SoundIDs {
     SOUND_1FF                       = 0x000001FF,
     SOUND_201                       = 0x00000201,
     SOUND_202                       = 0x00000202,
+    SOUND_203                       = 0x00000203,
     SOUND_204                       = 0x00000204,
     SOUND_205                       = 0x00000205,
     SOUND_207                       = 0x00000207,

include/functions.h

@@ -374,6 +374,7 @@ void btl_draw_upgrade_windows(s32);
 void btl_state_draw_celebration(void);
 
 void func_8024F7C8(void);
+s32 func_80265D44(s32 animID);
 void func_80263E08(Actor*, ActorPart*, s32);
 void func_80266978(void);
 void func_80266B14(void);
@@ -989,7 +990,7 @@ void set_max_SP(s8);
 void sync_status_menu(void);
 void create_cameras_a(void);
 void func_80045AC0(void);
-void func_8005DECC(Npc*, s32, void* arg2, f32, f32, s32, s32);
+void func_8005DECC(Npc*, s32, s32*, f32, f32, s32, s32);
 void func_8005DFD4(Npc*);
 void func_8005E12C(Npc*);
 void create_encounters(void);

include/npc.h

@@ -358,7 +358,7 @@ typedef struct EncounterStatus {
     /* 0x010 */ char unk_10;
     /* 0x011 */ s8 allowFleeing;
     /* 0x012 */ s8 unk_12;
-    /* 0x013 */ u8 dropWhackaBump;
+    /* 0x013 */ s8 dropWhackaBump;
     /* 0x014 */ s32 songID;
     /* 0x018 */ s32 unk_18;
     /* 0x01C */ s8 numEncounters; /* number of encounters for current map (in list) */
@@ -565,7 +565,7 @@ void func_8003D788(Npc* npc, s32);
 
 void func_8003DA38(Npc* npc, s32);
 
-s32 func_8003DC38(Npc*, s32);
+void func_8003DC38(Npc* npc, s32);
 
 void func_8003DFA0(Npc* npc, s32);
 

src/16F740.c

@@ -2458,7 +2458,7 @@ void btl_state_update_change_partner(void) {
         case BATTLE_STATE2_UNK_3:
             if (!does_script_exist(battleStatus->controlScriptID)) {
                 btl_delete_actor(partner);
-                playerData->currentPartner = battleStatus->unk_1AA[2];
+                playerData->currentPartner = battleStatus->unk_1AC;
                 load_partner_actor();
                 partner = battleStatus->partnerActor;
                 partner->scale.x = 0.1f;

src/39210_len_aa0.c

@@ -1,20 +1,20 @@
 #include "common.h"
 
-void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* arg4) {
+void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* outAirborne) {
     PlayerStatus* playerStatus = &gPlayerStatus;
     Npc* npc;
 
     *outX = 0.0f;
     *outY = 0.0f;
     *outZ = 0.0f;
-    *arg4 = FALSE;
+    *outAirborne = FALSE;
 
     if (npcID == NPC_SELF) {
         *outX = playerStatus->position.x;
         *outY = playerStatus->position.y;
         *outZ = playerStatus->position.z;
         if (playerStatus->flags & (PS_FLAGS_FALLING | PS_FLAGS_JUMPING)) {
-            *arg4 = TRUE;
+            *outAirborne = TRUE;
         }
     } else {
         npc = get_npc_unsafe(npcID);
@@ -22,14 +22,311 @@ void get_npc_pos(s32 npcID, f32* outX, f32* outY, f32* outZ, s32* arg4) {
         *outY = npc->pos.y;
         *outZ = npc->pos.z;
         if (npc->flags & NPC_FLAG_JUMPING) {
-            *arg4 = TRUE;
+            *outAirborne = TRUE;
         }
     }
 
 }
 
-INCLUDE_ASM(s32, "39210_len_aa0", func_8005DECC);
+void func_8005DECC(Npc* npc, s32 arg1, s32* animIDs, f32 arg3, f32 arg4, s32 arg5, s32 arg6) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
+    Unk2A4Blur* blur;
+    s32 i;
 
-INCLUDE_ASM(s32, "39210_len_aa0", func_8005DFD4);
+    npc->blur.unk2A4 = blur = heap_malloc(sizeof(*blur));
+    ASSERT(blur != NULL);
 
+    for (i = 0; i < ARRAY_COUNT(blur->unk_00); i++) {
+        blur->unk_00[i].pos.x = playerStatus->position.x;
+        blur->unk_00[i].pos.y = playerStatus->position.y;
+        blur->unk_00[i].pos.z = playerStatus->position.z;
+        blur->unk_00[i].unk_00 = 0;
+    }
+    blur->partIdx = 0;
+    blur->unk_284 = 0;
+    blur->unk_288 = 0;
+    blur->npcID = arg1;
+    blur->animIDs = animIDs;
+    blur->unk_294 = arg3;
+    blur->unk_298 = arg4;
+    blur->unk_29C = arg5;
+    blur->unk_2A0 = arg6;
+    npc->currentAnim = blur->animIDs[4];
+    npc->jumpVelocity = 0.0f;
+    npc->flags |= NPC_FLAG_GRAVITY;
+    npc->flags &= ~NPC_FLAG_100;
+    npc->collisionChannel = 0x10000;
+}
+
+void func_8005DFD4(Npc* npc) {
+    Unk2A4Blur* blur = npc->blur.unk2A4;
+    f32 x, y, z;
+    s32 airborne;
+    s32 isAirborne;
+    Unk2A4Part* part;
+
+    get_npc_pos(blur->npcID, &x, &y, &z, &airborne);
+    part = &blur->unk_00[blur->partIdx];
+    isAirborne = airborne != FALSE;
+
+    if (part->unk_00 != 0 && isAirborne) {
+        return;
+    }
+
+    if (!isAirborne && dist2D(npc->pos.x, npc->pos.z, x, z) <= blur->unk_29C && part->unk_00 == 0) {
+        return;
+    }
+
+    part = &blur->unk_00[blur->partIdx];
+    if (part->pos.x != x || part->pos.y != y || part->pos.z != z) {
+        if (blur->unk_284 != blur->partIdx + 1) {
+            blur->partIdx++;
+            if (blur->partIdx >= ARRAY_COUNT(blur->unk_00)) {
+                blur->partIdx = 0;
+            }
+            part = &blur->unk_00[blur->partIdx];
+            part->pos.x = x;
+            part->pos.y = y;
+            part->pos.z = z;
+            part->unk_00 = isAirborne;
+        }
+    }
+}
+
+// float regalloc
+#ifdef NON_MATCHING
+void func_8005E12C(Npc* npc) {
+    Unk2A4Blur* blur = npc->blur.unk2A4;
+    f32 x, y, z;
+    s32 airborne;
+    f32 sp28;
+    f32 sp2C;
+    f32 sp30;
+    f32 dist;
+    Unk2A4Part* part;
+    f32 npcX, npcZ;
+    f32 partX, partY, partZ;
+    f32 theta;
+    f32 yaw;
+
+    get_npc_pos(blur->npcID, &x, &y, &z, &airborne);
+
+    switch (blur->unk_288) {
+        case 0:
+            npcX = npc->pos.x;
+            npcZ = npc->pos.z;
+            part = &blur->unk_00[blur->unk_284];
+            partX = part->pos.x;
+            partZ = part->pos.z;
+            sp28 = npcX;
+            sp2C = npc->pos.y;
+            sp30 = npcZ;
+            npc->moveSpeed = blur->unk_294;
+            dist = dist2D(npcX, npcZ, x, z);
+            if (blur->unk_2A0 <= dist) {
+                npc->moveSpeed = blur->unk_298;
+            }
+            npc->currentAnim = blur->animIDs[5];
+            if (!(npc->flags & NPC_FLAG_1000)) {
+                npc->currentAnim = blur->animIDs[2];
+            }
+
+            while (TRUE) {
+                dist = dist2D(sp28, sp30, partX, partZ);
+                yaw = atan2(sp28, sp30, partX, partZ);
+                if (npc->moveSpeed < dist) {
+                    dist = dist2D(sp28, sp30, x, z);
+                    if (blur->unk_2A0 < dist) {
+                        break;
+                    }
+
+                    if (blur->unk_29C < dist) {
+                        npc->moveSpeed = dist - blur->unk_29C;
+                        if (npc->moveSpeed > blur->unk_294) {
+                            npc->moveSpeed = blur->unk_294;
+                        } else {
+                            npc->moveSpeed += 1.0;
+                        }
+                        break;
+                    }
+                }
+
+                if (blur->unk_284 == blur->partIdx) {
+                    npc->moveSpeed = 0.0f;
+                    yaw = npc->yaw;
+                    npc->currentAnim = blur->animIDs[4];
+                } else {
+                    dist = dist2D(npc->pos.x, npc->pos.z, x, z);
+                    if (dist <= blur->unk_29C) {
+                        npc->moveSpeed = 0.0f;
+                        yaw = npc->yaw;
+                        npc->currentAnim = blur->animIDs[4];
+                        blur->unk_288 = 0xA;
+                    } else {
+                        blur->unk_284++;
+                        if (blur->unk_284 >= ARRAY_COUNT(blur->unk_00)) {
+                            blur->unk_284 = 0;
+                        }
+                        part = &blur->unk_00[blur->unk_284];
+                        partX = part->pos.x;
+                        partZ = part->pos.z;
+                        if (npc->flags & NPC_FLAG_1000) {
+                            if (part->unk_00 != 0) {
+                                blur->unk_288 = 1;
+                                break;
+                            }
+                        }
+                        continue;
+                    }
+                }
+                break;
+            }
+
+            if (!(npc->flags & NPC_FLAG_1000)) {
+                npc->moveSpeed *= 0.5f;
+            }
+            npc->yaw = yaw;
+            npc_move_heading(npc, npc->moveSpeed, yaw);
+            if ((npc->flags & (NPC_FLAG_4000 | NPC_FLAG_1000)) == (NPC_FLAG_4000 | NPC_FLAG_1000)) {
+                blur->unk_288 = 1;
+            }
+            break;
+        case 1:
+            if (blur->unk_284 != blur->partIdx) {
+                blur->unk_284++;
+                if (blur->unk_284 >= ARRAY_COUNT(blur->unk_00)) {
+                    blur->unk_284 = 0;
+                }
+                part = &blur->unk_00[blur->unk_284];
+                partX = part->pos.x;
+                partY = part->pos.y;
+                partZ = part->pos.z;
+                npc->moveToPos.x = partX;
+                npc->moveToPos.y = partY;
+                npc->moveToPos.z = partZ;
+                npc->duration = 0;
+                npc->jumpScale = 2.0f;
+                npc->moveSpeed = blur->unk_298;
+                npc->planarFlyDist = dist2D(npc->pos.x, npc->pos.z, partX, partZ);
+                npc->yaw = atan2(npc->pos.x, npc->pos.z, npc->moveToPos.x, npc->moveToPos.z);
+                dist = npc->planarFlyDist;
+                sp2C = npc->moveToPos.y - npc->pos.y;
+                if (dist < sp2C) {
+                    dist = sp2C;
+                }
+                if (dist < blur->unk_29C) {
+                    npcX = npc->pos.x;
+                    npcZ = npc->pos.z;
+                    npc->jumpVelocity = 0.0f;
+                    npc->flags |= NPC_FLAG_GRAVITY;
+                    npc->yaw = atan2(npcX, npcZ, x, z);
+                    blur->unk_288 = 0;
+                    return;
+                }
+                npc->duration = dist / npc->moveSpeed;
+                if (npc->duration < 10) {
+                    npc->duration = 10;
+                }
+                npc->moveSpeed = npc->planarFlyDist / npc->duration;
+                npc->jumpVelocity = (sp2C + (npc->jumpScale * npc->duration * npc->duration * 0.5f)) / npc->duration;
+                npc->currentAnim = blur->animIDs[1];
+                npc->flags &= ~NPC_FLAG_GRAVITY;
+                blur->unk_288 = 2;
+            }
+            break;
+        case 2:
+            npc->jumpVelocity -= npc->jumpScale;
+            npc->pos.y += npc->jumpVelocity;
+            if (npc->jumpVelocity <= 0.0f) {
+                npc->currentAnim = blur->animIDs[2];
+            }
+            npc_move_heading(npc, npc->moveSpeed, npc->yaw);
+            if (npc->jumpVelocity <= 0.0f) {
+                sp28 = npc->pos.x;
+                sp30 = npc->pos.z;
+                dist = fabsf(npc->jumpVelocity) + 8.0;
+                sp2C = npc->pos.y + dist;
+                if ((npc_raycast_down_sides(npc->collisionChannel, &sp28, &sp2C, &sp30, &dist) != 0) && ((f64) dist <= ((f64) fabsf(npc->jumpVelocity) + 8.0))) {
+                    npc->currentAnim = blur->animIDs[3];
+                    npcX = sp28;
+                    npcZ = sp30;
+                    npc->jumpVelocity = 0.0f;
+                    npc->pos.y = sp2C;
+                    npc->flags |= NPC_FLAG_GRAVITY;
+                    npc->yaw = atan2(npcX, npcZ, x, z);
+                    blur->unk_288 = 0;
+                }
+            }
+            break;
+        case 10:
+            npcX = npc->pos.x;
+            npcZ = npc->pos.z;
+            part = &blur->unk_00[blur->unk_284];
+            partX = part->pos.x;
+            partZ = part->pos.z;
+            sp28 = npcX;
+            sp2C = npc->pos.y;
+            sp30 = npcZ;
+            dist = dist2D(npcX, npcZ, x, z);
+            if (dist <= blur->unk_29C) {
+                break;
+            }
+
+            while (TRUE) {
+                if (part->unk_00 != 0) {
+                    break;
+                }
+
+                theta = atan2(npc->pos.x, npc->pos.z, partX, partZ);
+                if (fabsf(get_clamped_angle_diff(theta, atan2(npc->pos.x, npc->pos.z, x, z))) < 90.0f) {
+                    break;
+                }
+
+                if (blur->unk_284 == blur->partIdx) {
+                    break;
+                }
+
+                blur->unk_284++;
+                if (blur->unk_284 >= ARRAY_COUNT(blur->unk_00)) {
+                    blur->unk_284 = 0;
+                }
+                part = &blur->unk_00[blur->unk_284];
+                partX = part->pos.x;
+                partZ = part->pos.z;
+                continue;
+            }
+
+            if (part->unk_00 == 0) {
+                blur->unk_288 = 0;
+                return;
+            }
+
+            while (TRUE) {
+                if (part->unk_00 == 0) {
+                    break;
+                }
+
+                theta = atan2(npc->pos.x, npc->pos.z, partX, partZ);
+                if (fabsf(get_clamped_angle_diff(theta, atan2(npc->pos.x, npc->pos.z, x, z))) < 90.0f) {
+                    break;
+                }
+
+                if (blur->unk_284 == blur->partIdx) {
+                    break;
+                }
+
+                blur->unk_284++;
+                if (blur->unk_284 >= ARRAY_COUNT(blur->unk_00)) {
+                    blur->unk_284 = 0;
+                }
+                part = &blur->unk_00[blur->unk_284];
+                partX = part->pos.x;
+                partZ = part->pos.z;
+            }
+            blur->unk_288 = 1;
+            break;
+    }
+}
+#else
 INCLUDE_ASM(s32, "39210_len_aa0", func_8005E12C);
+#endif

src/5B320.c

@@ -155,13 +155,9 @@ s32 pad_after_item_hudscripts[] = {
 
 #include "item_entity_scripts.inc.c"
 
-s32 D_8008EEC0[] = {
-0, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000009, 0x00000006, 0x00000007, 0x00000008, 0x00000005, 0x0000000A, 0x0000000B
-};
+s32 D_8008EEC0[] = { 0, 1, 2, 3, 4, 9, 6, 7, 8, 5, 10, 11 };
 
-s32 D_8008EEF0[] = {
-0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000004, 0x00000000, 0x00000006, 0x00000007, 0x00000008, 0x00000005, 0x00000000, 0x00000000
-};
+s32 D_8008EEF0[] = { 0, 1, 2, 3, 4, 0, 6, 7, 8, 5, 0, 0 };
 
 const char D_800989A0[] = "なし";
 

src/EA0C10.c

@@ -8,7 +8,7 @@
 
 const char ascii_EA6D70[] = "kzn_11";
 const char ascii_EA6D78[] = "kzn_18";
-extern s32 D_802466D0[];
+extern s32 EA0C10_D_802466D0[];
 
 void func_8004D8E0(DeadEnemy*);
 
@@ -76,13 +76,13 @@ ApiStatus func_80242A4C_EA334C(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            D_802466D0[i] = ptr[i];
+            EA0C10_D_802466D0[i] = ptr[i];
         }
-        D_802466D0[i] = 0;
+        EA0C10_D_802466D0[i] = 0;
     } else {
         for (i = 0; i < 112; i++) {
-            D_802466D0[i] = i + 16;
-            D_802466D0[112] = 0;
+            EA0C10_D_802466D0[i] = i + 16;
+            EA0C10_D_802466D0[112] = 0;
         }
     }
     return ApiStatus_DONE2;

src/EA8AE0.c

@@ -3,11 +3,11 @@
 #include "effects.h"
 #include "battle/battle.h"
 
-// Copy of kzn_19 (C8DBB0.c)
+// Copy of kzn_19 (kzn_19_3.npc.c)
 
 #define NAMESPACE EA8AE0
 
-extern s32 D_80248388[];
+extern s32 EA8AE0_D_80248388[];
 extern s32 D_80248380;
 extern s32 D_80243DD8_EAC8B8;
 extern s32 D_80243DDC_EAC8BC;
@@ -116,13 +116,13 @@ ApiStatus func_80241838_EAA318(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            D_80248388[i] = ptr[i];
+            EA8AE0_D_80248388[i] = ptr[i];
         }
-        D_80248388[i] = 0;
+        EA8AE0_D_80248388[i] = 0;
     } else {
         for (i = 0; i < 112; i++) {
-            D_80248388[i] = i + 16;
-            D_80248388[112] = 0;
+            EA8AE0_D_80248388[i] = i + 16;
+            EA8AE0_D_80248388[112] = 0;
         }
     }
     return ApiStatus_DONE2;

src/EB1170.c

@@ -8,7 +8,7 @@
 extern s32 func_80059AC8(s32, s32);
 extern s32 D_802417E4_EB2644;
 extern s32 D_802417E8_EB2648;
-extern s32 D_802442D0[];
+extern s32 EB1170_D_802442D0[];
 extern s32 EB1170_LetterDelivery_SavedNpcAnim;
 extern s32 D_800B8DEC;
 
@@ -54,13 +54,13 @@ ApiStatus func_802406E0_EB1540(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            D_802442D0[i] = ptr[i];
+            EB1170_D_802442D0[i] = ptr[i];
         }
-        D_802442D0[i] = 0;
+        EB1170_D_802442D0[i] = 0;
     } else {
         for (i = 0; i < 112; i++) {
-            D_802442D0[i] = i + 16;
-            D_802442D0[112] = 0;
+            EB1170_D_802442D0[i] = i + 16;
+            EB1170_D_802442D0[112] = 0;
         }
     }
     return ApiStatus_DONE2;

src/EB8E50.c

@@ -15,7 +15,9 @@ const char ascii_EC2028[] = "flo_09";
 const char ascii_EC2030[] = "flo_08";
 static const f64 rodata_alignment = 0.0;
 
+void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+
 ApiStatus func_80240000_EB8E50(void) {
-    dead_fx_sun(0, 0, 0, 0, 0, 0);
+    fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }

src/EDBFE0.c

@@ -3,7 +3,9 @@
 
 #define NAMESPACE ED8FE0
 
+void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+
 ApiStatus func_80240000_EDBFE0(Evt *script, s32 isInitialCall) {
-    dead_fx_sun(0, 0, 0, 0, 0, 0);
+    fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }

src/EDC020.c

@@ -5,18 +5,7 @@
 
 #define NAMESPACE EDC020
 
-extern s32 D_802429E0[];
-//extern s32** EDC020_varStash = NULL;
-
-/*
-extern s32 D_80241850_EDD830 = {
-    0x00000000,
-};
-
-extern s32 D_80241850_EDD834 = {
-    0x00000000,
-};
-*/
+extern s32 EDC020_D_802429E0[];
 
 #include "common/foliage.inc.c"
 
@@ -67,13 +56,13 @@ ApiStatus func_8024064C_EDC62C(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            D_802429E0[i] = ptr[i];
+            EDC020_D_802429E0[i] = ptr[i];
         }
-        D_802429E0[i] = 0;
+        EDC020_D_802429E0[i] = 0;
     } else {
         for (i = 0; i < 112; i++) {
-            D_802429E0[i] = i + 16;
-            D_802429E0[112] = 0;
+            EDC020_D_802429E0[i] = i + 16;
+            EDC020_D_802429E0[112] = 0;
         }
     }
     return ApiStatus_DONE2;

src/EDE9C0.c

@@ -3,7 +3,9 @@
 
 #define NAMESPACE EDE9C0
 
+void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+
 ApiStatus func_80240000_EDE9C0(Evt *script, s32 isInitialCall) {
-    dead_fx_sun(0, 0, 0, 0, 0, 0);
+    fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }

src/EE65B0.c

@@ -5,10 +5,14 @@
 
 #define NAMESPACE EE65B0
 
+extern f32 D_80243B44_EEA0F4;
+
 #include "world/common/atomic/TexturePan.inc.c"
 
+void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
+
 ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) {
-    dead_fx_sun(0, 0, 0, 0, 0, 0);
+    fx_sun_undeclared(0, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }
 
@@ -43,6 +47,39 @@ ApiStatus func_8024046C_EE6A1C(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "EE65B0", func_80240504_EE6AB4);
+void func_80240504_EE6AB4(void) {
+    Matrix4f matrix;
+    Vtx* sp50;
+    Vtx* sp54;
+    s32 sp58;
+    s32 new_var;
+
+    guMtxIdentF(matrix);
+
+    matrix[0][0] = (sin_rad(D_80243B44_EEA0F4 / 11.0f) * 0.04) + 0.98;
+    matrix[0][1] = sin_rad(D_80243B44_EEA0F4 / 12.0f) * 0.04;
+    matrix[0][2] = cos_rad(D_80243B44_EEA0F4 / 13.0f) * 0.04;
+
+    matrix[1][1] = (sin_rad(D_80243B44_EEA0F4 / 7.0f + 1.0f) * 0.04) + 0.98;
+    matrix[1][0] = sin_rad(D_80243B44_EEA0F4 / 14.0f) * 0.04;
+    matrix[1][2] = cos_rad(D_80243B44_EEA0F4 / 15.0f) * 0.04;
+
+    matrix[2][2] = (sin_rad(D_80243B44_EEA0F4 * 0.25f + 2.0f)  * 0.04) + 0.98;
+    matrix[2][0] = sin_rad(D_80243B44_EEA0F4 * 0.0625f) * 0.04;
+    matrix[2][1] = cos_rad(D_80243B44_EEA0F4 / 17.0f) * 0.04;
+
+    guMtxF2L(matrix, &gDisplayContext->matrixStack[gMatrixListPos]);
+    mdl_get_copied_vertices(0, &sp50, &sp54, &sp58);
+
+    new_var = 0;
+    while (new_var); // TODO required to match
+
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(0));
+
+    D_80243B44_EEA0F4 += 1.0f;
+}
+
 
 INCLUDE_ASM(s32, "EE65B0", func_802407D4_EE6D84);

src/npc.c

@@ -1723,7 +1723,59 @@ void func_8003DA38(Npc* npc, s32 arg1) {
 INCLUDE_ASM(void, "npc", func_8003DA38, Npc* npc, s32 arg1);
 #endif
 
+// floats suqqz
+#ifdef NON_EQUIVALENT
+void func_8003DC38(Npc* npc, s32 arg1) {
+    f32 temp_f0;
+    f32 xTemp;
+    f32 zTemp;
+    f32 yTemp;
+    f32 theta;
+    f32 sinTheta;
+    s32 i;
+    s32 var_v0;
+    f32 cosTheta;
+
+    D_80077C2C += 0.1f;
+    if (arg1 == 2) {
+        fx_cloud_puff(npc->pos.x, (npc->pos.y + 14.0f) - 5.0f, npc->pos.z, D_80077C24);
+
+        D_80077C24 = clamp_angle(D_80077C24 + 35.0f);
+
+        for (i = 0; i < 4; i++) {
+            xTemp = rand_int(10) - 5;
+            zTemp = rand_int(10) - 5;
+            yTemp = -2.0f - (SQ(xTemp) + SQ(zTemp) / 5.0f);
+            D_80077C28 = 0;
+            theta = DEG_TO_RAD(clamp_angle(-npc->yaw + (i * 90)));
+            sinTheta = sin_rad(theta);
+            cosTheta = cos_rad(theta);
+            fx_cloud_trail(
+                1,
+                npc->pos.x + (npc->collisionRadius * sinTheta * -0.3f) + xTemp,
+                npc->pos.y + 15.5f + yTemp,
+                npc->pos.z + (npc->collisionRadius * cosTheta * -0.3f) + zTemp
+            );
+        }
+    } else {
+        xTemp = rand_int(10) - 5;
+        zTemp = rand_int(10) - 5;
+        yTemp = -2.0f - (SQ(xTemp) + SQ(zTemp) / 5.0f);
+        D_80077C28 = 0;
+        theta = DEG_TO_RAD(clamp_angle(-npc->yaw));
+        sinTheta = sin_rad(theta);
+        cosTheta = cos_rad(theta);
+        fx_cloud_trail(
+            1,
+            npc->pos.x + (npc->collisionRadius * sinTheta * -0.3f) + xTemp,
+            npc->pos.y + 15.5f + yTemp,
+            npc->pos.z + (npc->collisionRadius * cosTheta * -0.3f) + zTemp
+        );
+    }
+}
+#else
 INCLUDE_ASM(s32, "npc", func_8003DC38);
+#endif
 
 void func_8003DFA0(Npc* npc, s32 arg1) {
     if (D_80077C30++ >= 4) {

src/world/area_dro/dro_02/9694C0.c

@@ -36,23 +36,23 @@ enum {
 
 // BSS
 
-typedef struct {
-    s32 unk_00;
-    f32 unk_04;
-    f32 unk_08;
-    f32 unk_0C;
-    f32 unk_10;
-    f32 unk_14;
-    s32 unk_18;
-    s32 unk_1C;
-    s32 unk_20;
+typedef struct D_8024F010_Struct {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ f32 unk_04;
+    /* 0x08 */ f32 unk_08;
+    /* 0x0C */ f32 unk_0C;
+    /* 0x10 */ f32 unk_10;
+    /* 0x14 */ f32 unk_14;
+    /* 0x18 */ s32 unk_18;
+    /* 0x1C */ s32 unk_1C;
+    /* 0x20 */ s32 unk_20;
 } D_8024F010_Struct; // size = 0x24
 
-static s8 N(pad_D_8024EF80)[0x4];
+static f32 N(D_8024EF80);
 static f32 N(D_8024EF84);
 static s32 N(D_8024EF88);
 static s8 N(pad_D_8024EF8C)[0x4];
-static EffectInstance* N(D_8024EF90)[4]; // possibly bigger?
+static EffectInstance* N(D_8024EF90)[4];
 static s32 N(Quizmo_Worker);
 static s32 N(pad_D_8024EFA4);
 static s32 N(Quizmo_ScriptArray)[4];
@@ -2614,8 +2614,275 @@ void N(func_80242214_96B3D4)(s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg
     *arg4 = clamp_angle(F010_ptr->unk_10);
 }
 
-INCLUDE_ASM(void, "world/area_dro/dro_02/9694C0", dro_02_func_8024240C_96B5CC, Evt* script,
-            s32 isInitialCall);
+void dro_02_func_8024240C_96B5CC(Evt* script, s32 isInitialCall) {
+    f32 sp18;
+    f32 sp1C;
+    f32 sp20;
+    f32 sp24;
+    f32 sp28;
+    f32 sp2C;
+    f32 sp30;
+    f32 sp34;
+    f32 sp38;
+    f32 sp3C;
+    f32 sp40;
+    f32 sp44;
+    f32 sp48;
+    f32 sp4C;
+    f32 sp50;
+    f32 sp54;
+    f32 sp58;
+    f32 sp5C;
+    f32 sp60;
+    f32 sp64;
+    f32 sp68;
+    f32 sp6C;
+    f32 sp70;
+    f32 sp74;
+    EffectInstance* effect;
+    EnergyInOutFXData* data;
+    s32 i, j;
+
+    switch (evt_get_variable(N(D_8024EFCC), ArrayVar(9))) {
+        case 0:
+            N(D_8024EF88) = 0;
+            evt_set_variable(N(D_8024EFCC), ArrayVar(9), 1);
+            N(D_8024F010)[0].unk_00 = 1;
+            N(D_8024F010)[0].unk_04 = -200.0f;
+            N(D_8024F010)[0].unk_08 = 0.0f;
+            N(D_8024F010)[0].unk_0C = 0.0f;
+            N(D_8024F010)[0].unk_14 = 0.0f;
+            N(D_8024F010)[0].unk_1C = 12;
+            N(D_8024F010)[0].unk_20 = 2;
+
+            N(D_8024F010)[1].unk_1C = 48;
+            N(D_8024F010)[2].unk_18 = 8;
+            N(D_8024F010)[2].unk_1C = 5;
+            N(D_8024F010)[0].unk_10 = 0.0f;
+            N(D_8024F010)[0].unk_18 = 1;
+            N(D_8024F010)[1].unk_00 = 1;
+            N(D_8024F010)[1].unk_08 = 0.0f;
+            N(D_8024F010)[1].unk_14 = 0.0f;
+            N(D_8024F010)[1].unk_10 = 0.0f;
+            N(D_8024F010)[1].unk_18 = 1;
+            N(D_8024F010)[1].unk_20 = 0;
+            N(D_8024F010)[2].unk_00 = 1;
+            N(D_8024F010)[2].unk_04 = 0.0f;
+            N(D_8024F010)[2].unk_14 = 0.0f;
+            N(D_8024F010)[2].unk_10 = 0.0f;
+            N(D_8024F010)[2].unk_20 = 4;
+            N(D_8024F010)[1].unk_04 = 200.0f;
+            N(D_8024F010)[1].unk_0C = 1.0f;
+            N(D_8024F010)[2].unk_08 = 200.0f;
+            N(D_8024F010)[2].unk_0C = 2.0f;
+            break;
+        case 1:
+            N(D_8024EF88)++;
+            N(D_8024F010)[0].unk_04 += 10.0f;
+            N(D_8024F010)[1].unk_04 += -10.0f;
+            N(D_8024F010)[2].unk_08 += -10.0f;
+            if (N(D_8024EF88) == 18) {
+                gPlayerStatus.position.y = -1000.0f;
+            }
+            if (N(D_8024EF88) == 20) {
+                evt_set_variable(N(D_8024EFCC), ArrayVar(9), 2);
+                N(D_8024EF88) = 0;
+            }
+            break;
+        case 2:
+            N(D_8024F010)[0].unk_00 = 2;
+            N(D_8024F010)[1].unk_00 = 0;
+            N(D_8024F010)[2].unk_00 = 0;
+            N(D_8024F010)[0].unk_04 = 0.0f;
+            N(D_8024F010)[0].unk_08 = 0.0f;
+            N(D_8024F010)[0].unk_0C = 0;
+            break;
+        case 3:
+            N(D_8024F010)[0].unk_00 = 1;
+            N(D_8024F010)[1].unk_00 = 1;
+            N(D_8024F010)[2].unk_00 = 1;
+            N(D_8024EF88)++;
+            N(D_8024F010)[0].unk_04 -= 10.0f;
+            N(D_8024F010)[1].unk_04 += 10.0f;
+            if (N(D_8024EF88) == 10) {
+                N(D_8024EF88) = 0;
+                evt_set_variable(N(D_8024EFCC), ArrayVar(9), 4);
+            }
+            break;
+        case 4:
+            N(D_8024F010)[0].unk_08 = 0.0f;
+            N(D_8024F010)[0].unk_0C = 0;
+            N(D_8024F010)[1].unk_08 = 0.0f;
+            N(D_8024F010)[2].unk_04 = 0;
+            N(D_8024F010)[2].unk_08 = 0.0f;
+            N(D_8024F010)[0].unk_04 = -100.0f;
+            N(D_8024F010)[1].unk_04 = 100.0f;
+            N(D_8024F010)[1].unk_0C = 1.0f;
+            N(D_8024F010)[2].unk_0C = 2.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 20) {
+                N(D_8024EF88) = 0;
+                evt_set_variable(N(D_8024EFCC), ArrayVar(9), 5);
+                sfx_play_sound_with_params(SOUND_203, 0, 0x18, 0);
+            }
+            break;
+        case 5:
+            N(D_8024F010)[1].unk_10 = 0.0f;
+            N(D_8024F010)[2].unk_10 = 0.0f;
+            N(D_8024F010)[0].unk_10 += 18.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 8) {
+                N(func_80242214_96B3D4)(0, &sp18, &sp1C, &sp20, &sp24);
+                fx_sparkles(0, sp18, sp1C + 20.0f, sp20, 30.0f);
+            }
+            if (N(D_8024EF88) == 10) {
+                N(D_8024EF88) = 0;
+                evt_set_variable(N(D_8024EFCC), ArrayVar(9), 6);
+                sfx_play_sound_with_params(SOUND_203, 0, 0x40, 0);
+            }
+            break;
+        case 6:
+            N(D_8024F010)[1].unk_10 = 0.0f;
+            N(D_8024F010)[0].unk_10 += 18.0f;
+            N(D_8024F010)[2].unk_10 += 18.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 8) {
+                N(func_80242214_96B3D4)(2, &sp28, &sp2C, &sp30, &sp34);
+                fx_sparkles(0, sp28, sp2C + 20.0f, sp30, 30.0f);
+            }
+            if (N(D_8024EF88) == 10) {
+                N(D_8024EF88) = 0;
+                evt_set_variable(N(D_8024EFCC), ArrayVar(9), 7);
+                sfx_play_sound_with_params(SOUND_203, 0, 0x68, 0);
+            }
+            break;
+        case 7:
+            N(D_8024F010)[0].unk_10 = 0.0f;
+            N(D_8024EF88)++;
+            N(D_8024F010)[1].unk_10 += 18.0f;
+            N(D_8024F010)[2].unk_10 += 18.0f;
+            if (N(D_8024EF88) == 8) {
+                N(func_80242214_96B3D4)(1, &sp38, &sp3C, &sp40, &sp44);
+                fx_sparkles(0, sp38, sp3C + 20.0f, sp40, 30.0f);
+            }
+            if (N(D_8024EF88) == 10) {
+                N(D_8024EF88) = 0;
+                evt_set_variable(N(D_8024EFCC), ArrayVar(9), 8);
+            }
+            break;
+        case 8:
+            N(D_8024F010)[0].unk_10 = 0.0f;
+            N(D_8024F010)[2].unk_10 = 0.0f;
+            N(D_8024F010)[1].unk_10 += 18.0f;
+            N(D_8024EF88)++;
+            if (N(D_8024EF88) == 10) {
+                N(D_8024EF88) = 0;
+                evt_set_variable(N(D_8024EFCC), ArrayVar(9), 9);
+            }
+            break;
+        case 9:
+            N(D_8024F010)[0].unk_08 = 0.0f;
+            N(D_8024F010)[0].unk_10 = 0.0f;
+            N(D_8024F010)[1].unk_08 = 0.0f;
+            N(D_8024F010)[1].unk_10 = 0.0f;
+            N(D_8024F010)[2].unk_04 = 0;
+            N(D_8024F010)[2].unk_08 = 0.0f;
+            N(D_8024F010)[2].unk_10 = 0.0f;
+            N(D_8024EF88)++;
+            N(D_8024F010)[0].unk_04 += 10.0f;
+            N(D_8024F010)[1].unk_04 -= 10.0f;
+            if (N(D_8024EF88) == 10) {
+                N(D_8024EF88) = 0;
+                evt_set_variable(N(D_8024EFCC), ArrayVar(9), 10);
+                return;
+            }
+            break;
+        case 10:
+            N(D_8024F010)[0].unk_00 = 3;
+            N(D_8024F010)[0].unk_18 = 8;
+            N(D_8024F010)[1].unk_00 = 0;
+            N(D_8024F010)[2].unk_00 = 0;
+            N(D_8024F010)[0].unk_1C = 0x11;
+            return;
+        case 11:
+            N(D_8024F010)[0].unk_00 = 4;
+            N(D_8024F010)[1].unk_00 = 5;
+            N(D_8024F010)[1].unk_18 = 8;
+            N(D_8024F010)[0].unk_04 = 0.0f;
+            N(D_8024F010)[0].unk_0C = 0;
+            N(D_8024F010)[1].unk_04 = 0.0f;
+            N(D_8024F010)[1].unk_0C = 0;
+            N(D_8024F010)[1].unk_1C = 10;
+            N(D_8024F010)[1].unk_20 = 0;
+            N(D_8024EF88) = 0;
+            N(D_8024F010)[0].unk_08 = 68.0f;
+            N(D_8024F010)[0].unk_10 = 180.0f;
+            N(D_8024F010)[1].unk_08 = 68.0f;
+            N(D_8024F010)[1].unk_10 = 180.0f;
+            evt_set_variable(N(D_8024EFCC), ArrayVar(9), 12);
+            N(D_8024EF80) = 0.0f;
+            N(D_8024EF84) = 1.0f;
+
+            N(func_80242214_96B3D4)(1, &sp48, &sp4C, &sp50, &sp54);
+
+            for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) {
+                s32 i;
+
+                N(D_8024EF90)[j] = fx_energy_in_out(2, sp48, sp4C + 20.0f, sp50, 8.0f, -1);
+                N(D_8024EF90)[j]->data.energyInOut->unk_28 = 215;
+                N(D_8024EF90)[j]->data.energyInOut->unk_2C = 55;
+                N(D_8024EF90)[j]->data.energyInOut->unk_30 = 255;
+
+                for (i = 1; i < N(D_8024EF90)[j]->numParts; i++) {
+                    N(D_8024EF90)[j]->data.energyInOut[i].unk_38 *= 0.1;
+                }
+            }
+            break;
+        case 12:
+            N(func_80242214_96B3D4)(1, &sp58, &sp5C, &sp60, &sp64);
+
+            for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) {
+                s32 i;
+
+                N(D_8024EF90)[j]->data.energyInOut->pos.x = sp58;
+                N(D_8024EF90)[j]->data.energyInOut->pos.y = sp5C + 20.0f;
+                N(D_8024EF90)[j]->data.energyInOut->pos.z = sp60;
+                N(D_8024EF90)[j]->data.energyInOut->scale -= 0.1;
+
+                if (N(D_8024EF90)[j]->data.energyInOut->scale < 0.1) {
+                    N(D_8024EF90)[j]->data.energyInOut->scale = 0.1f;
+                }
+
+                for (i = 1; i < N(D_8024EF90)[j]->numParts; i++, data++) {
+                    N(D_8024EF90)[j]->data.energyInOut[i].unk_38 += 0.01;
+                }
+            }
+
+            N(D_8024F010)[0].unk_08 += N(D_8024EF80);
+            N(D_8024F010)[1].unk_08 += N(D_8024EF84);
+            N(D_8024EF80) += 0.4;
+            N(D_8024EF84) -= 0.05;
+            N(D_8024EF88) += 1;
+
+            if (N(D_8024F010)[1].unk_08 < -5.0f) {
+                N(D_8024F010)[1].unk_08 = -5.0f;
+                N(D_8024EF88) = 0;
+                evt_set_variable(dro_02_D_8024EFCC, ArrayVar(9), 13);
+                N(D_8024F010)[0].unk_00 = 0;
+                N(D_8024F010)[1].unk_00 = 0;
+                N(func_80242214_96B3D4)(1, &sp68, &sp6C, &sp70, &sp74);
+                fx_sparkles(0, sp68, sp6C + 20.0f, sp70, 30.0f);
+                sfx_play_sound(0x206);
+
+                for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) {
+                    N(D_8024EF90)[j]->flags |= 0x10;
+                }
+            }
+            break;
+        case 13:
+            break;
+    }
+}
 
 void N(func_80242EAC_96C06C)(Evt* script, s32 isInitialCall) {
     Matrix4f sp20;

src/world/area_flo/flo_12/CC0E70.c

@@ -7,7 +7,7 @@ enum {
     NPC_ROSIE1,
 };
 
-static s32 N(D_802429E0)[112];
+static s32 N(flo_12_D_802429E0)[112];
 
 EntryList N(entryList) = {
     { 280.0f, 0.0f, 0.0f, 270.0f },
@@ -218,7 +218,7 @@ EvtScript N(80241858) = {
 
 EvtScript N(8024199C) = {
     EVT_CALL(N(func_8024064C_CC147C), LVar0)
-    EVT_BIND_PADLOCK(N(80241858), 0x10, 0, EVT_PTR(N(D_802429E0)), 0, 1)
+    EVT_BIND_PADLOCK(N(80241858), 0x10, 0, EVT_PTR(N(flo_12_D_802429E0)), 0, 1)
     EVT_CALL(N(func_802405C0_CC13F0), LVar0)
     EVT_RETURN
     EVT_END
@@ -517,13 +517,13 @@ ApiStatus N(func_8024064C_CC147C)(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            N(D_802429E0)[i] = ptr[i];
+            N(flo_12_D_802429E0)[i] = ptr[i];
         }
-        N(D_802429E0)[i] = 0;
+        N(flo_12_D_802429E0)[i] = 0;
     } else {
         for (i = 0; i < 0x70; i++) {
-            N(D_802429E0)[i] = i + 16;
-            N(D_802429E0)[112] = 0;
+            N(flo_12_D_802429E0)[i] = i + 16;
+            N(flo_12_D_802429E0)[112] = 0;
         }
     }
     return ApiStatus_DONE2;

src/world/area_flo/flo_14/CCB310.c

@@ -607,13 +607,12 @@ ApiStatus N(func_8024046C_CCB77C)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-// graphics macros
-#ifdef NON_EQUIVALENT
 void N(func_80240504_CCB814)(void) {
     Matrix4f matrix;
     Vtx* sp50;
     Vtx* sp54;
     s32 sp58;
+    s32 new_var;
 
     guMtxIdentF(matrix);
 
@@ -630,16 +629,17 @@ void N(func_80240504_CCB814)(void) {
     matrix[2][1] = cos_rad(N(D_80243B14_CCEE24) / 17.0f) * 0.04;
 
     guMtxF2L(matrix, &gDisplayContext->matrixStack[gMatrixListPos]);
-
     mdl_get_copied_vertices(0, &sp50, &sp54, &sp58);
-    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+
+    new_var = 0;
+    while (new_var); // TODO required to match
+
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
     gSPDisplayList(gMasterGfxPos++, mdl_get_copied_gfx(0));
 
     N(D_80243B14_CCEE24) += 1.0f;
 }
-#else
-INCLUDE_ASM(void, "world/area_flo/flo_14/CCB310", flo_14_func_80240504_CCB814, void);
-#endif
 
 void N(func_802407D4_CCBAE4)(void) {
     s32 i;

src/world/area_hos/hos_01/A11020.c

@@ -6,11 +6,33 @@ extern u32 D_80241C30_A124B0;
 
 #include "world/common/atomic/TexturePan.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240AAC_A1132C);
+ApiStatus func_80240AAC_A1132C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240B10_A11390);
+    effect->data.unk_75->unk_78 = 190.0f;
+    effect->data.unk_75->unk_7C = 220.0f;
+    effect->data.unk_75->unk_68 = 0.7f;
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240B64_A113E4);
+ApiStatus func_80240B10_A11390(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++);
+
+    effect->data.unk_75->unk_78 = 170.0f;
+    effect->data.unk_75->unk_7C = 170.0f;
+    effect->data.unk_75->unk_68 = 2.0f;
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240B64_A113E4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    EffectInstance* effect = (EffectInstance*) evt_get_variable(script, *args++);
+
+    effect->data.unk_75->unk_38 = evt_get_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
 
 void func_80240BB8_A11438(void) {
     gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0,
@@ -18,7 +40,12 @@ void func_80240BB8_A11438(void) {
     gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80241C2C_A124AC);
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C08_A11488);
+ApiStatus func_80240C08_A11488(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    D_80241C2C_A124AC = evt_get_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
 
 void func_80240C34_A114B4(void) {
     gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0,
@@ -26,7 +53,12 @@ void func_80240C34_A114B4(void) {
     gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80241C30_A124B0);
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C84_A11504);
+ApiStatus func_80240C84_A11504(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+
+    D_80241C30_A124B0 = evt_get_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/SwitchToPartner.inc.c"
 

src/world/area_hos/hos_02/A16220.c

@@ -3,9 +3,18 @@
 static char* N(exit_str_0) = "hos_01";
 static char* N(exit_str_1) = "hos_03";
 
+extern u16 D_802433AC_A195CC;
+
 #include "world/common/atomic/TexturePan.inc.c"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_8024030C_A1652C);
+void func_8024030C_A1652C(void) {
+    f32 scale = ((sins(D_802433AC_A195CC) * (1 / 32768.0f)) * 0.5 * 0.5) + 1.05;
+
+    D_802433AC_A195CC += 409;
+    guScale(&gDisplayContext->matrixStack[gMatrixListPos], scale, scale, scale);
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+}
 
 INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240434_A16654);
 

src/world/area_hos/hos_02/A171F0.c

@@ -1,3 +1,6 @@
 #include "hos_02.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_02/A171F0", func_80240FD0_A171F0);
+ApiStatus func_80240FD0_A171F0(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = gGameStatusPtr->entryID;
+    return ApiStatus_DONE2;
+}

src/world/area_hos/hos_03/A1B130.c

@@ -1,5 +1,7 @@
 #include "hos_03.h"
 
+extern u16 D_80243BD4_A1ECD4;
+
 #include "world/common/atomic/TexturePan.inc.c"
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024033C_A1B43C);
@@ -8,6 +10,16 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024060C_A1B70C);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_802407E8_A1B8E8);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240928_A1BA28);
+void func_80240928_A1BA28(void) {
+    f32 scale = ((sins(D_80243BD4_A1ECD4) * (1 / 32768.0f)) * 0.5 * 0.5) + 1.05;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240A50_A1BB50);
+    D_80243BD4_A1ECD4 += 409;
+    guScale(&gDisplayContext->matrixStack[gMatrixListPos], scale, scale, scale);
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+}
+
+ApiStatus func_80240A50_A1BB50(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = gGameStatusPtr->entryID;
+    return ApiStatus_DONE2;
+}

src/world/area_hos/hos_04/A26ED0.c

@@ -3,9 +3,25 @@
 static char* N(exit_str_0) = "hos_03";
 static char* N(exit_str_1) = "hos_05";
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240000_A26ED0);
+extern u16 D_802416F0_A285C0;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024);
+void func_80240000_A26ED0(void) {
+    f32 temp_f0 = ((sin_rad(D_802416F0_A285C0 * (1 / 32.0f)) + 1.0f) * 0.25f) + 0.75;
+
+    guScale(&gDisplayContext->matrixStack[gMatrixListPos], (temp_f0 * 0.3) + 0.5, temp_f0, (temp_f0 * 0.3) + 0.5);
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+    D_802416F0_A285C0++;
+}
+
+void func_80240154_A27024(void) {
+    f64 t1 = (sin_rad(D_802416F0_A285C0 * (1 / 32.0f)) * 10.0f) + 1.5;
+    f64 t2 = sin_rad(D_802416F0_A285C0 * 0.25f) * 2.5;
+
+    guTranslate(&gDisplayContext->matrixStack[gMatrixListPos], 0.0f, t1 + t2, 0.0f);
+    gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++],
+              G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
+}
 
 #include "world/common/atomic/TexturePan.inc.c"
 

src/world/area_hos/hos_04/A27490.c

@@ -1,3 +1,6 @@
 #include "hos_04.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A27490", func_802405C0_A27490);
+ApiStatus func_802405C0_A27490(Evt* script, s32 isInitialCall) {
+    script->varTable[0] = gGameStatusPtr->entryID;
+    return ApiStatus_DONE2;
+}

src/world/area_hos/hos_04/A274B0.c

@@ -1,4 +1,14 @@
 #include "hos_04.h"
+#include "nu/nusys.h"
+
+extern f32 D_80241B54_A28A24;
+extern f32 D_80241B74_A28A44;
+extern f32 D_80241B7C_A28A4C;
+extern s32 D_80241B80_A28A50;
+extern s32 D_80241B84_A28A54;
+extern s32 D_80241B88_A28A58;
+extern f32 D_80243370;
+extern f32 D_80243374;
 
 ApiStatus N(SetCamXXVfov)(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -8,18 +18,114 @@ ApiStatus N(SetCamXXVfov)(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240654_A27524);
+ApiStatus func_80240654_A27524(Evt* script, s32 isInitialCall) {
+    if (gGameStatusPtr->creditsViewportMode < 5U) {
+        gGameStatusPtr->creditsViewportMode++;
+        state_init_intro();
+    }
+    return ApiStatus_DONE1;
+}
 
 ApiStatus func_8024068C_A2755C(Evt* script, s32 isInitialCall) {
     return ApiStatus_BLOCK;
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240694_A27564);
+void func_80240694_A27564(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32* arg4) {
+    f32 temp_f2 = arg1 - arg2;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240734_A27604);
+    if (arg1 - arg0 > 0.0f) {
+        if (temp_f2 < 0.0f) {
+            *arg4 = arg1;
+        } else if (arg3 < temp_f2) {
+            *arg4 += arg3;
+        } else {
+            *arg4 += temp_f2;
+        }
+    } else if (temp_f2 > 0.0f) {
+        *arg4 = arg1;
+    } else if (temp_f2 < -arg3) {
+        *arg4 -= arg3;
+    } else {
+        *arg4 += temp_f2;
+    }
+}
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802408F8_A277C8);
+void func_80240734_A27604(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32* arg5) {
+    f32 var_f12_2;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802409B0_A27880);
+    if (arg3 > arg4) {
+        arg3 = arg4;
+    }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240A84_A27954);
+    switch (arg0) {
+        case 1:
+            var_f12_2 = sin_deg((arg3 / arg4) * 90.0f);
+            break;
+        case 2:
+            if (arg3 < 30.0f) {
+                var_f12_2 = 0.0f;
+            } else {
+                var_f12_2 = sin_deg((((arg3 - 30.0f) / (arg4 - 30.0f)) * 90.0f) + -90.0f) + 1.0f;
+            }
+            break;
+        case 3:
+            var_f12_2 = (sin_deg(((arg3 / arg4) * 180.0f) - 90.0f) + 1.0f) * 0.5;
+            break;
+        case 4:
+            var_f12_2 = sin_deg(((arg3 / arg4) * 90.0f) - 90.0f) + 1.0f;
+            break;
+        case 5:
+            var_f12_2 = (2.0 * (sin_deg(((arg3 / arg4) * 60.0f) - 60.0f) + 0.8660254f)) / 1.7320507764816284;
+            break;
+        default:
+            var_f12_2 = arg3 / arg4;
+            break;
+    }
+    *arg5 = arg1 + ((arg2 - arg1) * var_f12_2);
+}
+
+ApiStatus func_802408F8_A277C8(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    if (nuGfxCfb_ptr == D_80241B80_A28A50) {
+        return ApiStatus_BLOCK;
+    }
+
+    D_80241B80_A28A50 = nuGfxCfb_ptr;
+    func_80240694_A27564(700.0f, 300.0f, D_80241B7C_A28A4C, 1.2f, &D_80241B7C_A28A4C);
+    camera->panActive = TRUE;
+    camera->controlSettings.boomLength = D_80241B7C_A28A4C;
+    return ApiStatus_BLOCK;
+}
+
+ApiStatus func_802409B0_A27880(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    if (isInitialCall) {
+        D_80243370 = D_80241B54_A28A24;
+    }
+    func_80240734_A27604(1, D_80241B54_A28A24, 700.0f, D_80241B84_A28A54, 70.0f, &D_80243370);
+    camera->panActive = TRUE;
+    camera->controlSettings.boomLength = D_80243370;
+    D_80241B84_A28A54++;
+    if (D_80241B84_A28A54 < 70) {
+        return ApiStatus_BLOCK;
+    }
+    return ApiStatus_DONE1;
+}
+
+ApiStatus func_80240A84_A27954(Evt* script, s32 isInitialCall) {
+    Camera* camera = &gCameras[gCurrentCameraID];
+
+    if (isInitialCall) {
+        D_80243374 = D_80241B74_A28A44;
+    }
+    func_80240734_A27604(5, D_80241B74_A28A44, -80.0f, D_80241B88_A28A58, 200.0f, &D_80243374);
+    camera->panActive = TRUE;
+    camera->controlSettings.viewPitch = D_80243374;
+    D_80241B88_A28A58++;
+    if (D_80241B88_A28A58 == 200) {
+        return ApiStatus_DONE2;
+    }
+    return ApiStatus_BLOCK;
+}

src/world/area_hos/hos_04/A27A30.c

@@ -1,3 +1,21 @@
 #include "hos_04.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A27A30", func_80240B60_A27A30);
+ApiStatus func_80240B60_A27A30(Evt* script, s32 isInitialCall) {
+    if (isInitialCall) {
+        script->functionTemp[1] = 0;
+    }
+
+    script->functionTemp[1] += 16;
+
+    if (script->functionTemp[1] > 255) {
+        script->functionTemp[1] = 255;
+    }
+
+    set_screen_overlay_params_front(0, script->functionTemp[1]);
+
+    if (script->functionTemp[1] == 255) {
+        return ApiStatus_DONE2;
+    }
+
+    return ApiStatus_BLOCK;
+}

src/world/area_hos/hos_04/A27AA0.c

@@ -1,7 +1,19 @@
 #include "hos_04.h"
 
+const char D_80243330_A2A200[] = "hos_20\0\0kpa_60\0\0hos_00\0\0osr_03\0\0hos_05";
+
+extern s32 D_80243284_A2A154;
+
+void func_80240BD0_A27AA0(s32*);
 INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240BD0_A27AA0);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E40_A27D10);
+ApiStatus func_80240E40_A27D10(Evt* script) {
+    Bytecode* args = script->ptrReadPos;
 
-INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E6C_A27D3C);
+    set_curtain_draw_callback((void (*)) evt_get_variable(script, *args++));
+    return ApiStatus_DONE2;
+}
+
+void func_80240E6C_A27D3C(void) {
+    func_80240BD0_A27AA0(&D_80243284_A2A154);
+}

src/world/area_hos/hos_05/A2A240.c

@@ -18,6 +18,30 @@ ApiStatus N(AwaitScriptComplete)(Evt* script, s32 isInitialCall) {
     }
 }
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240634_A2A874);
+ApiStatus func_80240634_A2A874(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 idx = evt_get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240690_A2A8D0);
+    script->varTable[idx] = evt_get_float_variable(script, *args++);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus func_80240690_A2A8D0(Evt* script, s32 isInitialCall) {
+    f32 vt2 = script->varTable[2];
+    f32 temp_f20;
+    f32 temp_f26;
+
+    script->varTable[2] = EVT_FLOAT(0);
+    script->varTable[3] = EVT_FLOAT(100);
+    script->varTable[4] = EVT_FLOAT(0);
+
+    temp_f26 = (script->varTable[1] * 180.0f) / PI;
+    temp_f20 = (rand_int(10) / vt2) + 3.0f;
+
+    script->varTable[10] = EVT_FLOAT_TO_FIXED(temp_f20 * cos_rad(temp_f26));
+    script->varTable[11] = EVT_FLOAT_TO_FIXED(rand_int(15) + 5);
+    script->varTable[12] = EVT_FLOAT_TO_FIXED(temp_f20 * sin_rad(temp_f26));
+    script->varTable[13] = EVT_FLOAT_TO_FIXED((f32)(rand_int(10) + 10) * -0.05);
+
+    return ApiStatus_DONE2;
+}

src/world/area_hos/hos_05/A2AA70.c

@@ -1,3 +1,10 @@
 #include "hos_05.h"
 
-INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AA70", func_80240830_A2AA70);
+ApiStatus func_80240830_A2AA70(Evt* script, s32 isInitialCall) {
+    gPlayerData.starBeamLevel = 1;
+    gPlayerData.curHP = gPlayerData.curMaxHP;
+    gPlayerData.curFP = gPlayerData.curMaxFP;
+    gPlayerData.specialBarsFilled = gPlayerData.maxStarPower * 256;
+    sync_status_menu();
+    return ApiStatus_DONE2;
+}

src/world/area_hos/hos_05/A2EC30.c

@@ -4,6 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_802449F0_A2EC30);
 
 ApiStatus func_80244C60_A2EEA0(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
+
     void (*callback)(void) = (void (*)(void))evt_get_variable(script, *args++);
     set_curtain_draw_callback(callback);
     return ApiStatus_DONE2;

src/world/area_hos/hos_06/A397F0.c

@@ -20,7 +20,26 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406E0_A39BC0);
+extern s32 hos_06_D_80246260[];
+
+ApiStatus func_802406E0_A39BC0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            hos_06_D_80246260[i] = ptr[i];
+        }
+        hos_06_D_80246260[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            hos_06_D_80246260[i] = i + 16;
+            hos_06_D_80246260[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_hos/hos_06/A3A230.c

@@ -8,7 +8,26 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C);
 
 INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0);
 
-INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008_A3A4E8);
+extern s32 hos_06_D_80246430[];
+
+ApiStatus func_80241008_A3A4E8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            hos_06_D_80246430[i] = ptr[i];
+        }
+        hos_06_D_80246430[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            hos_06_D_80246430[i] = i + 16;
+            hos_06_D_80246430[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 #define NAMESPACE dup_hos_06
 #include "world/common/StashVars.inc.c"

src/world/area_iwa/iwa_10/91F5A0.c

@@ -0,0 +1,32 @@
+#include "iwa_10.h"
+
+#include "world/common/util/ChangeNpcToPartner.inc.c"
+
+#include "world/common/GetNpcCollisionHeight.inc.c"
+
+#include "world/common/AddPlayerHandsOffset.inc.c"
+
+INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802413E0_91F950);
+
+INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241434_91F9A4);
+
+extern s32 iwa_10_D_80248480[];
+
+ApiStatus func_8024146C_91F9DC(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            iwa_10_D_80248480[i] = ptr[i];
+        }
+        iwa_10_D_80248480[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            iwa_10_D_80248480[i] = i + 16;
+            iwa_10_D_80248480[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}

src/world/area_jan/jan_02/B2C8A0.c

@@ -12,7 +12,26 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578_B2D9E8);
+extern s32 D_80248760_jan_02[];
+
+ApiStatus func_80241578_B2D9E8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80248760_jan_02[i] = ptr[i];
+        }
+        D_80248760_jan_02[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_80248760_jan_02[i] = i + 16;
+            D_80248760_jan_02[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(Quizmo_Worker);
 extern s32 N(Quizmo_AnswerResult);

src/world/area_jan/jan_03/B34BD0.c

@@ -27,9 +27,47 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8);
 
 INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C_B365FC);
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A64_B36634);
+extern s32 D_8024FBA0[];
 
-INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00_B366D0);
+ApiStatus func_80241A64_B36634(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_8024FBA0[i] = ptr[i];
+        }
+        D_8024FBA0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_8024FBA0[i] = i + 16;
+            D_8024FBA0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 D_8024FD68[];
+
+ApiStatus func_80241B00_B366D0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_8024FD68[i] = ptr[i];
+        }
+        D_8024FD68[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_8024FD68[i] = i + 128;
+            D_8024FD68[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(Quizmo_Worker);
 extern s32 N(Quizmo_AnswerResult);

src/world/area_kkj/kkj_18/AF2FE0.c

@@ -3,8 +3,7 @@
 
 extern s32 D_80241F10_AF4BB0;
 extern s32 D_80241F14_AF4BB4;
-extern s32 D_80244E78[];
-extern s32 tik_07_FlyingAI_JumpVels[];
+extern s32 kkj_18_D_80244E78[];
 
 #include "world/common/GetNpcCollisionHeight.inc.c"
 
@@ -40,6 +39,8 @@ ApiStatus func_802405C0_AF3260(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
+extern s32 kkj_18_D_80244CB0[];
+
 ApiStatus func_802405F8_AF3298(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
     s32* ptr = (s32*)evt_get_variable(script, *args++);
@@ -47,13 +48,13 @@ ApiStatus func_802405F8_AF3298(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            tik_07_FlyingAI_JumpVels[i] = ptr[i];
+            kkj_18_D_80244CB0[i] = ptr[i];
         }
-        tik_07_FlyingAI_JumpVels[i] = 0;
+        kkj_18_D_80244CB0[i] = 0;
     } else {
         for (i = 0; i < 112; i++) {
-            tik_07_FlyingAI_JumpVels[i] = i + 16;
-            tik_07_FlyingAI_JumpVels[112] = 0;
+            kkj_18_D_80244CB0[i] = i + 16;
+            kkj_18_D_80244CB0[112] = 0;
         }
     }
 
@@ -67,13 +68,13 @@ ApiStatus func_80240694_AF3334(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            D_80244E78[i] = ptr[i];
+            kkj_18_D_80244E78[i] = ptr[i];
         }
-        D_80244E78[i] = 0;
+        kkj_18_D_80244E78[i] = 0;
     } else {
         for (i = 0; i < 91; i++) {
-            D_80244E78[i] = i + 128;
-            D_80244E78[91] = 0;
+            kkj_18_D_80244E78[i] = i + 128;
+            kkj_18_D_80244E78[91] = 0;
         }
     }
 

src/world/area_kkj/kkj_19/AF7C00.c

@@ -3,7 +3,7 @@
 
 extern s32 D_80241B10_AF9460;
 extern s32 D_80241B14_AF9464;
-extern s32 D_802461F0[];
+extern s32 kkj_19_D_802461F0[];
 extern s32 D_802463B8_kkj_19[];
 extern s32 D_8024652C;
 extern s32 D_80246530;
@@ -63,13 +63,13 @@ ApiStatus func_80240568_AF7EB8(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            D_802461F0[i] = ptr[i];
+            kkj_19_D_802461F0[i] = ptr[i];
         }
-        D_802461F0[i] = 0;
+        kkj_19_D_802461F0[i] = 0;
     } else {
         for (i = 0; i < 112; i++) {
-            D_802461F0[i] = i + 16;
-            D_802461F0[112] = 0;
+            kkj_19_D_802461F0[i] = i + 16;
+            kkj_19_D_802461F0[112] = 0;
         }
     }
 

src/world/area_kmr/kmr_02/8B0070.c

@@ -40,7 +40,26 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC);
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330);
 
-INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8_8B2368);
+extern s32 kmr_02_D_80257F58[];
+
+ApiStatus func_802422F8_8B2368(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            kmr_02_D_80257F58[i] = ptr[i];
+        }
+        kmr_02_D_80257F58[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            kmr_02_D_80257F58[i] = i + 16;
+            kmr_02_D_80257F58[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404);
 

src/world/area_kpa/kpa_81/A78510.c

@@ -42,4 +42,23 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790);
 
 INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8);
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802403A4_A78864);
+extern s32 D_80242208[];
+
+ApiStatus func_802403A4_A78864(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80242208[i] = ptr[i];
+        }
+        D_80242208[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_80242208[i] = i + 128;
+            D_80242208[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}

src/world/area_kpa/kpa_82/A7A550.c

@@ -17,6 +17,44 @@ ApiStatus func_802402D0_A7A7D0(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_80240308_A7A808);
+extern s32 D_80248F90[];
 
-INCLUDE_ASM(s32, "world/area_kpa/kpa_82/A7A550", func_802403A4_A7A8A4);
+ApiStatus func_80240308_A7A808(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80248F90[i] = ptr[i];
+        }
+        D_80248F90[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_80248F90[i] = i + 16;
+            D_80248F90[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 D_80249158[];
+
+ApiStatus func_802403A4_A7A8A4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80249158[i] = ptr[i];
+        }
+        D_80249158[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_80249158[i] = i + 128;
+            D_80249158[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}

src/world/area_mac/mac_00/7EB340.c

@@ -19,9 +19,47 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C_7EC68C);
+extern s32 mac_00_D_80255BA0[];
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728);
+ApiStatus func_8024197C_7EC68C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            mac_00_D_80255BA0[i] = ptr[i];
+        }
+        mac_00_D_80255BA0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            mac_00_D_80255BA0[i] = i + 16;
+            mac_00_D_80255BA0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 mac_00_D_80255D68[];
+
+ApiStatus func_80241A18_7EC728(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            mac_00_D_80255D68[i] = ptr[i];
+        }
+        mac_00_D_80255D68[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            mac_00_D_80255D68[i] = i + 128;
+            mac_00_D_80255D68[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_mac/mac_00/7ED280.c

@@ -24,7 +24,26 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0);
+extern s32 D_80255EE0[];
+
+ApiStatus func_802437D0_7EE4E0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80255EE0[i] = ptr[i];
+        }
+        D_80255EE0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_80255EE0[i] = i + 16;
+            D_80255EE0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 #define NAMESPACE dup_mac_00
 extern s32 N(LetterDelivery_SavedNpcAnim);

src/world/area_mac/mac_01/8017D0.c

@@ -75,7 +75,26 @@ ApiStatus func_80243D28_8045A8(Evt* script, s32 isInitialCall) {
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0);
+extern s32 mac_01_D_80262A70[];
+
+ApiStatus func_80243D60_8045E0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            mac_01_D_80262A70[i] = ptr[i];
+        }
+        mac_01_D_80262A70[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            mac_01_D_80262A70[i] = i + 16;
+            mac_01_D_80262A70[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_mac/mac_02/823BF0.c

@@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4_825D94);
 
-extern s32 D_8024E570[];
+extern s32 mac_02_D_8024E570[];
 
 ApiStatus func_80242B0C_825DCC(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -51,19 +51,38 @@ ApiStatus func_80242B0C_825DCC(Evt* script, s32 isInitialCall) {
 
     if (ptr != NULL) {
         for (i = 0; ptr[i] != 0; i++) {
-            D_8024E570[i] = ptr[i];
+            mac_02_D_8024E570[i] = ptr[i];
         }
-        D_8024E570[i] = 0;
+        mac_02_D_8024E570[i] = 0;
     } else {
         for (i = 0; i < 112; i++) {
-            D_8024E570[i] = i + 16;
-            D_8024E570[112] = 0;
+            mac_02_D_8024E570[i] = i + 16;
+            mac_02_D_8024E570[112] = 0;
         }
     }
     return ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242BA8_825E68);
+extern s32 mac_02_D_8024E738[];
+
+ApiStatus func_80242BA8_825E68(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            mac_02_D_8024E738[i] = ptr[i];
+        }
+        mac_02_D_8024E738[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            mac_02_D_8024E738[i] = i + 128;
+            mac_02_D_8024E738[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242C44_825F04);
 

src/world/area_mac/mac_03/831B20.c

@@ -21,7 +21,26 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC);
+extern s32 mac_03_D_80251400[];
+
+ApiStatus func_802417FC_832FFC(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            mac_03_D_80251400[i] = ptr[i];
+        }
+        mac_03_D_80251400[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            mac_03_D_80251400[i] = i + 16;
+            mac_03_D_80251400[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_mac/mac_04/843030.c

@@ -19,7 +19,26 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802417AC_84437C);
+extern s32 mac_04_D_8024F5D0[];
+
+ApiStatus func_802417AC_84437C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            mac_04_D_8024F5D0[i] = ptr[i];
+        }
+        mac_04_D_8024F5D0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            mac_04_D_8024F5D0[i] = i + 16;
+            mac_04_D_8024F5D0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848_844418);
 

src/world/area_mac/mac_05/852170.c

@@ -31,9 +31,47 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750);
 
 INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634_8547A4);
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C_8547DC);
+extern s32 mac_05_D_80252A00[];
 
-INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878);
+ApiStatus func_8024266C_8547DC(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            mac_05_D_80252A00[i] = ptr[i];
+        }
+        mac_05_D_80252A00[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            mac_05_D_80252A00[i] = i + 16;
+            mac_05_D_80252A00[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 mac_05_D_80252BC8[];
+
+ApiStatus func_80242708_854878(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            mac_05_D_80252BC8[i] = ptr[i];
+        }
+        mac_05_D_80252BC8[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            mac_05_D_80252BC8[i] = i + 128;
+            mac_05_D_80252BC8[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_mac/machi/7E7550.c

@@ -1,15 +1,15 @@
 #include "machi.h"
 
-extern s32 D_80241180_7E8520;
+extern s32 D_80241180_7E8520[];
 
 ApiStatus func_802401B0_7E7550(Evt* script, s32 isInitialCall) {
     Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
 
     if (rand_int(1000) < 500) {
-        func_8005DECC(npc, -1, &D_80241180_7E8520,
+        func_8005DECC(npc, -1, D_80241180_7E8520,
                       rand_int(4) + 1, rand_int(3) + 5, rand_int(50) + 50, rand_int(100) + 100);
     } else {
-        func_8005DECC(npc, rand_int(3) + 10, &D_80241180_7E8520,
+        func_8005DECC(npc, rand_int(3) + 10, D_80241180_7E8520,
                       rand_int(4) + 1, rand_int(3) + 5, rand_int(50) + 50, rand_int(100) + 10);
     }
     return ApiStatus_DONE2;

src/world/area_nok/nok_01/9C53E0.c

@@ -47,7 +47,26 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494);
+extern s32 nok_01_D_80251C70[];
+
+ApiStatus func_802420B4_9C7494(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            nok_01_D_80251C70[i] = ptr[i];
+        }
+        nok_01_D_80251C70[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            nok_01_D_80251C70[i] = i + 16;
+            nok_01_D_80251C70[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_nok/nok_02/9D7020.c

@@ -25,4 +25,23 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678_9D7698);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802406B0_9D76D0);
+extern s32 nok_02_D_802547D0[];
+
+ApiStatus func_802406B0_9D76D0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            nok_02_D_802547D0[i] = ptr[i];
+        }
+        nok_02_D_802547D0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            nok_02_D_802547D0[i] = i + 16;
+            nok_02_D_802547D0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}

src/world/area_nok/nok_02/9D7AA0.c

@@ -23,7 +23,26 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C);
+extern s32 nok_02_D_802549D0[];
+
+ApiStatus func_80242C5C_9D9C7C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            nok_02_D_802549D0[i] = ptr[i];
+        }
+        nok_02_D_802549D0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            nok_02_D_802549D0[i] = i + 16;
+            nok_02_D_802549D0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_nok/nok_02/9DA8F0.c

@@ -14,9 +14,47 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C);
 
 INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40_9DAC60);
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C78_9DAC98);
+extern s32 nok_02_D_80254BA0[];
 
-INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14_9DAD34);
+ApiStatus func_80243C78_9DAC98(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            nok_02_D_80254BA0[i] = ptr[i];
+        }
+        nok_02_D_80254BA0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            nok_02_D_80254BA0[i] = i + 16;
+            nok_02_D_80254BA0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 nok_02_D_80254D68[];
+
+ApiStatus func_80243D14_9DAD34(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            nok_02_D_80254D68[i] = ptr[i];
+        }
+        nok_02_D_80254D68[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            nok_02_D_80254D68[i] = i + 128;
+            nok_02_D_80254D68[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 #define NAMESPACE dup2_nok_02
 #include "world/common/StashVars.inc.c"

src/world/area_obk/obk_03/BC43F0.c

@@ -12,7 +12,26 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4_BC4734);
 
 INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788);
 
-INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240540_BC47C0);
+extern s32 D_80243BE0[];
+
+ApiStatus func_80240540_BC47C0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80243BE0[i] = ptr[i];
+        }
+        D_80243BE0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_80243BE0[i] = i + 16;
+            D_80243BE0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_omo/omo_05/DB22C0.c

@@ -17,7 +17,26 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802421CC_DB448C);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242204_DB44C4);
+extern s32 D_80245650[];
+
+ApiStatus func_80242204_DB44C4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80245650[i] = ptr[i];
+        }
+        D_80245650[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_80245650[i] = i + 128;
+            D_80245650[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802422A0_DB4560);
 

src/world/area_omo/omo_13/DE2710.c

@@ -31,6 +31,25 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F00_DE3390);
 
 INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F54_DE33E4);
 
-INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F8C_DE341C);
+extern s32 flo_10_npcSettings_80243220[];
+
+ApiStatus func_80240F8C_DE341C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            flo_10_npcSettings_80243220[i] = ptr[i];
+        }
+        flo_10_npcSettings_80243220[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            flo_10_npcSettings_80243220[i] = i + 128;
+            flo_10_npcSettings_80243220[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80241028_DE34B8);

src/world/area_pra/pra_01/D4D060.c

@@ -17,9 +17,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241200_D4E240);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238_D4E278);
+extern s32 D_80242FB0[];
 
-INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802412D4_D4E314);
+ApiStatus func_80241238_D4E278(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80242FB0[i] = ptr[i];
+        }
+        D_80242FB0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_80242FB0[i] = i + 16;
+            D_80242FB0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 pra_01_80243178[];
+
+ApiStatus func_802412D4_D4E314(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            pra_01_80243178[i] = ptr[i];
+        }
+        pra_01_80243178[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            pra_01_80243178[i] = i + 128;
+            pra_01_80243178[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 ApiStatus PostChapter7StatUpdate(Evt* script, s32 isInitialCall) {
     PlayerData* playerData = &gPlayerData;

src/world/area_pra/pra_02/D50010.c

@@ -12,7 +12,26 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411A0_D51190);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241274_D51264);
+extern s32 D_80243E88_846A58[];
+
+ApiStatus func_80241274_D51264(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80243E88_846A58[i] = ptr[i];
+        }
+        D_80243E88_846A58[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_80243E88_846A58[i] = i + 128;
+            D_80243E88_846A58[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/SetEntityPositionF.inc.c"
 

src/world/area_pra/pra_09/D588B0.c

@@ -10,9 +10,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_8024114C_D599DC);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411A0_D59A30);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_802411D8_D59A68);
+extern s32 flo_18_shakeTree[];
 
-INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80241274_D59B04);
+ApiStatus func_802411D8_D59A68(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            flo_18_shakeTree[i] = ptr[i];
+        }
+        flo_18_shakeTree[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            flo_18_shakeTree[i] = i + 16;
+            flo_18_shakeTree[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 D_80246BE8[];
+
+ApiStatus func_80241274_D59B04(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80246BE8[i] = ptr[i];
+        }
+        D_80246BE8[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_80246BE8[i] = i + 128;
+            D_80246BE8[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80241310_D59BA0);
 

src/world/area_pra/pra_13/D64600.c

@@ -10,9 +10,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_8024114C_D6572C);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411A0_D65780);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_802411D8_D657B8);
+extern s32 D_80243720[];
 
-INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241274_D65854);
+ApiStatus func_802411D8_D657B8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80243720[i] = ptr[i];
+        }
+        D_80243720[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_80243720[i] = i + 16;
+            D_80243720[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 pra_13_802438E8[];
+
+ApiStatus func_80241274_D65854(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            pra_13_802438E8[i] = ptr[i];
+        }
+        pra_13_802438E8[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            pra_13_802438E8[i] = i + 128;
+            pra_13_802438E8[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80241310_D658F0);
 

src/world/area_pra/pra_19/D6E9D0.c

@@ -10,9 +10,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024114C_D6FAFC);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411A0_D6FB50);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802411D8_D6FB88);
+extern s32 D_802479F0[];
 
-INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241274_D6FC24);
+ApiStatus func_802411D8_D6FB88(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_802479F0[i] = ptr[i];
+        }
+        D_802479F0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_802479F0[i] = i + 16;
+            D_802479F0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 D_80247BB8_pra_19[];
+
+ApiStatus func_80241274_D6FC24(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80247BB8_pra_19[i] = ptr[i];
+        }
+        D_80247BB8_pra_19[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_80247BB8_pra_19[i] = i + 128;
+            D_80247BB8_pra_19[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241310_D6FCC0);
 

src/world/area_pra/pra_31/D7ED80.c

@@ -8,9 +8,47 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC);
 
 INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402A0_D7F000);
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402D8_D7F038);
+extern s32 D_80247CA0[];
 
-INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240374_D7F0D4);
+ApiStatus func_802402D8_D7F038(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80247CA0[i] = ptr[i];
+        }
+        D_80247CA0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_80247CA0[i] = i + 16;
+            D_80247CA0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 D_80247E68[];
+
+ApiStatus func_80240374_D7F0D4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_80247E68[i] = ptr[i];
+        }
+        D_80247E68[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_80247E68[i] = i + 128;
+            D_80247E68[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240410_D7F170);
 

src/world/area_sam/sam_01/CF7E80.c

@@ -11,9 +11,47 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240590_CF8100);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802405C8_CF8138);
+extern s32 D_8024DBC0[];
 
-INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664_CF81D4);
+ApiStatus func_802405C8_CF8138(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_8024DBC0[i] = ptr[i];
+        }
+        D_8024DBC0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_8024DBC0[i] = i + 16;
+            D_8024DBC0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 D_8024DD88[];
+
+ApiStatus func_80240664_CF81D4(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_8024DD88[i] = ptr[i];
+        }
+        D_8024DD88[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_8024DD88[i] = i + 128;
+            D_8024DD88[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(Quizmo_Worker);
 extern s32 N(Quizmo_AnswerResult);

src/world/area_sam/sam_04/D138E0.c

@@ -8,6 +8,44 @@ INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_8024053C_D13B0C);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240590_D13B60);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_802405C8_D13B98);
+extern s32 sam_04_80245210[];
 
-INCLUDE_ASM(s32, "world/area_sam/sam_04/D138E0", func_80240664_D13C34);
+ApiStatus func_802405C8_D13B98(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            sam_04_80245210[i] = ptr[i];
+        }
+        sam_04_80245210[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            sam_04_80245210[i] = i + 16;
+            sam_04_80245210[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 D_802453D8[];
+
+ApiStatus func_80240664_D13C34(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_802453D8[i] = ptr[i];
+        }
+        D_802453D8[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_802453D8[i] = i + 128;
+            D_802453D8[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}

src/world/area_sam/sam_06/D203E0.c

@@ -14,9 +14,47 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C);
 
 INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241DE0_D21C70);
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241E18_D21CA8);
+extern s32 D_8024BEA0[];
 
-INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44);
+ApiStatus func_80241E18_D21CA8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_8024BEA0[i] = ptr[i];
+        }
+        D_8024BEA0[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            D_8024BEA0[i] = i + 16;
+            D_8024BEA0[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 D_8024C068[];
+
+ApiStatus func_80241EB4_D21D44(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            D_8024C068[i] = ptr[i];
+        }
+        D_8024C068[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            D_8024C068[i] = i + 128;
+            D_8024C068[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/atomic/ToadHouse.inc.c"
 

src/world/area_sbk/sbk_02/92A9A0.c

@@ -23,7 +23,7 @@ API_CALLABLE(func_8024091C_92ABCC) {
 INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC);
 #endif
 
-static s32 D_80245630[91];
+static s32 sbk_02_D_80245630[91];
 extern s32 D_8024404C_92E2FC;
 extern s32 D_80244050_92E300;
 
@@ -42,13 +42,13 @@ API_CALLABLE(func_802409A8_92AC58) {
 
     if (buf != NULL) {
         for (i = 0; *buf != NULL; i++) {
-            D_80245630[i] = *buf++;
+            sbk_02_D_80245630[i] = *buf++;
         }
-        D_80245630[i] = 0;
+        sbk_02_D_80245630[i] = 0;
     } else {
         for (i = 0; i <= 90; i++) {
-            D_80245630[i] = i + 0x80;
-            D_80245630[91] = 0;
+            sbk_02_D_80245630[i] = i + 0x80;
+            sbk_02_D_80245630[91] = 0;
         }
     }
     return ApiStatus_DONE2;

src/world/area_sbk/sbk_02/sbk_02_3_npc.c

@@ -25,7 +25,7 @@ API_CALLABLE(func_8024091C_92ABCC) {
 INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC);
 #endif
 
-static s32 D_80245630[91];
+static s32 sbk_02_D_80245630[91];
 extern s32 D_8024404C_92E2FC;
 extern s32 D_80244050_92E300;
 
@@ -44,13 +44,13 @@ API_CALLABLE(func_802409A8_92AC58) {
 
     if (buf != NULL) {
         for (i = 0; *buf != NULL; i++) {
-            D_80245630[i] = *buf++;
+            sbk_02_D_80245630[i] = *buf++;
         }
-        D_80245630[i] = 0;
+        sbk_02_D_80245630[i] = 0;
     } else {
         for (i = 0; i <= 90; i++) {
-            D_80245630[i] = i + 0x80;
-            D_80245630[91] = 0;
+            sbk_02_D_80245630[i] = i + 0x80;
+            sbk_02_D_80245630[91] = 0;
         }
     }
     return ApiStatus_DONE2;

src/world/area_sbk/sbk_30/93F5B0.c

@@ -37,9 +37,47 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241120_9406D0);
 // SetLetterChoiceResult
 INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241174_940724);
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802411AC_94075C);
+extern s32 sbk_30_D_80244A50[];
 
-INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248_9407F8);
+ApiStatus func_802411AC_94075C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            sbk_30_D_80244A50[i] = ptr[i];
+        }
+        sbk_30_D_80244A50[i] = 0;
+    } else {
+        for (i = 0; i < 112; i++) {
+            sbk_30_D_80244A50[i] = i + 16;
+            sbk_30_D_80244A50[112] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
+
+extern s32 sbk_30_D_80244C18[];
+
+ApiStatus func_80241248_9407F8(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32* ptr = (s32*) evt_get_variable(script, *args++);
+    s32 i;
+
+    if (ptr != NULL) {
+        for (i = 0; ptr[i] != 0; i++) {
+            sbk_30_D_80244C18[i] = ptr[i];
+        }
+        sbk_30_D_80244C18[i] = 0;
+    } else {
+        for (i = 0; i < 91; i++) {
+            sbk_30_D_80244C18[i] = i + 128;
+            sbk_30_D_80244C18[91] = 0;
+        }
+    }
+    return ApiStatus_DONE2;
+}
 
 extern s32 N(LetterDelivery_SavedNpcAnim);
 #include "world/common/LetterDelivery.inc.c"

src/world/area_tik/tik_25/8A8600.c

@@ -1,7 +1,26 @@
 #include "tik_25.h"
+#include "entity.h"
 
-INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240680_8A8600);
+ApiStatus func_80240680_8A8600(Evt* script, s32 isInitialCall) {
+    get_entity_by_index(script->varTable[0])->dataBuf.chest->gotItemDone = TRUE;
+    return ApiStatus_DONE2;
+}
 
 #include "world/common/SetEntityPosition.inc.c"
 
+// linker sym needed
+#ifdef NON_MATCHING
+ApiStatus func_80240770_8A86F0(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    Entity* entity;
+
+    entity = get_entity_by_index(evt_get_variable(script, *args++));
+    if (entity == NULL) {
+        return ApiStatus_BLOCK;
+    }
+    play_model_animation(entity->virtualModelIndex, 0x1E4);
+    return ApiStatus_DONE2;
+}
+#else
 INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240770_8A86F0);
+#endif

src/world/common/DeadUnkFunc1.inc.c

@@ -1,8 +1,8 @@
 #include "common.h"
 
-void dead_fx_sun(s32, s32, s32, s32, s32, s32);
+void fx_sun_undeclared(s32, s32, s32, s32, s32, s32);
 
 ApiStatus N(DeadUnkFunc1)(Evt* script, s32 isInitialCall) {
-    dead_fx_sun(1, 0, 0, 0, 0, 0);
+    fx_sun_undeclared(1, 0, 0, 0, 0, 0);
     return ApiStatus_DONE2;
 }

tools/ignored_funcs.txt

@@ -27,7 +27,6 @@ dead_sqrtf = 0x80067040;
 dead_npc_test_move_simple_with_slipping = 0x800E5304;
 dead_npc_raycast_down_sides = 0x800E423C;
 dead_is_point_within_region = 0x8004D0C4;
-func_8004D8E0 = 0x8004D8E0;
 dead_rand_int = 0x8002ACEC;
 dead_get_npc_safe = 0x8003E534; // get_npc_safe
 dead_heap_malloc = 0x8002BFD4;
@@ -45,6 +44,7 @@ dead_update_lerp = 0x8002B6A4;
 dead_fx_spirit_card = 0x80077930;
 dead_create_shadow_type = 0x8011AAB4;
 dead_dist3D = 0x8002B21C;
+func_8004D8E0 = 0x8004D8E0;
 func_802E2A80 = 0x802E2A80;
 func_802E2B74 = 0x802E2B74;
 func_80128510 = 0x80128510;
@@ -54,7 +54,7 @@ func_80059AC8 = 0x80059AC8;
 dead_get_entity_by_index = 0x80118BB0;
 dead_cos_rad = 0x8002B4C0;
 dead_fx_sun = 0x80077BD0;
-func_80041080 = 0x80041080;
+dead_func_8003D660 = 0x80041080;
 dead_set_max_SP = 0x800F1D9C;
 dead_sync_status_menu = 0x800F1730;
 dead_get_npc_by_index = 0x8003C43C;

tools/sortsymz.py

@@ -10,7 +10,11 @@ with open("tools/symz.txt") as f:
     for line in f.readlines():
         if line.strip() and not line.startswith("//"):
             name, addr = line.strip().strip(";").split(" = ")
-            syms.append({"name": name, "address": int(addr, 0), "found_in": set(), "dead": False})
+            try :
+                addr = int(addr, 0)
+            except ValueError:
+                continue
+            syms.append({"name": name, "address": addr, "found_in": set(), "dead": False})
 
 # Search src for syms
 for root, dirs, files in os.walk("src"):

ver/us/asm/data/dead/EA3A80.data.s

@@ -108,7 +108,7 @@ dlabel D_802441BC_EA4ABC
 .word 0x00000000
 
 dlabel D_802441C0_EA4AC0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802441C0_EA4AC0, 0x00000010, 0x00000000, EA0C10_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244354_EA4C54
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -117,7 +117,7 @@ dlabel D_802443D4_EA4CD4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA0C10_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80244354_EA4C54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242A14_EA3314, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802446F8_EA4FF8
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242A4C_EA334C, 0xFE363C80, 0x0000004E, 0x00000006, D_802443D4_EA4CD4, 0x00000010, 0x00000000, EA0C10_D_802466D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802429C0_EA32C0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244768_EA5068
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0C10_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_802446F8_EA4FF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80244158_EA4A58, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0C10_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/dead/EAA810.data.s

@@ -156,7 +156,7 @@ dlabel D_80243DDC_EAC8BC
 .word 0x00000000
 
 dlabel D_80243DE0_EAC8C0
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243DE0_EAC8C0, 0x00000010, 0x00000000, EA8AE0_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80243F74_EACA54
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -165,7 +165,7 @@ dlabel D_80243FF4_EACAD4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EA8AE0_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80243F74_EACA54, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241800_EAA2E0, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244318_EACDF8
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80241838_EAA318, 0xFE363C80, 0x0000004E, 0x00000006, D_80243FF4_EACAD4, 0x00000010, 0x00000000, EA8AE0_D_80248388, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802417AC_EAA28C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244388_EACE68
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80244318_EACDF8, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80243D78_EAC858, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/dead/EB1920.data.s

@@ -63,7 +63,7 @@ dlabel D_802417E8_EB2648
 .word 0x00000000
 
 dlabel D_802417EC_EB264C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_802417EC_EB264C, 0x00000010, 0x00000000, EB1170_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241980_EB27E0
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -72,7 +72,7 @@ dlabel D_80241A00_EB2860
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EB1170_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241980_EB27E0, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241D24_EB2B84
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, D_80241A00_EB2860, 0x00000010, 0x00000000, EB1170_D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241D94_EB2BF4
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB1170_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, D_80241D24_EB2B84, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80241784_EB25E4, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB1170_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/dead/EDC6D0.data.s

@@ -48,7 +48,7 @@ dlabel D_80241858_EDD838
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, EDC020_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240614_EDC5F4, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024199C_EDD97C
-.word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_8024064C_EDC62C, 0xFE363C80, 0x0000004E, 0x00000006, D_80241858_EDD838, 0x00000010, 0x00000000, EDC020_D_802429E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802405C0_EDC5A0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802419EC_EDD9CC
 .word 0x0000001E, 0x00000000

ver/us/asm/data/world/area_hos/hos_06/A3C090.data.s

@@ -21,7 +21,7 @@ dlabel D_80242C70_A3C150
 .word 0x00000000
 
 dlabel D_80242C74_A3C154
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242C74_A3C154, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242E08_A3C2E8
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -30,7 +30,7 @@ dlabel D_80242E88_A3C368
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80242E08_A3C2E8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_A39B88, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802431AC_A3C68C
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242E88_A3C368, 0x00000010, 0x00000000, D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_A39BC0, 0xFE363C80, 0x0000004E, 0x00000006, D_80242E88_A3C368, 0x00000010, 0x00000000, hos_06_D_80246260, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_A39B34, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024321C_A3C6FC
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802431AC_A3C68C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80242C0C_A3C0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_hos/hos_06/A3DAB0.data.s

@@ -12,7 +12,7 @@ dlabel D_802445D8_A3DAB8
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, hos_06_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240FD0_A3A4B0, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024471C_A3DBFC
-.word 0x00000043, 0x00000002, func_80241008_A3A4E8, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D8_A3DAB8, 0x00000010, 0x00000000, D_80246430_8E0530, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F7C_A3A45C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80241008_A3A4E8, 0xFE363C80, 0x0000004E, 0x00000006, D_802445D8_A3DAB8, 0x00000010, 0x00000000, hos_06_D_80246430, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240F7C_A3A45C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel dup_hos_06_varStash
 .word 0x00000000

ver/us/asm/data/world/area_kkj/kkj_18/AF4BB0.data.s

@@ -9,10 +9,10 @@ dlabel D_80241F14_AF4BB4
 .word 0x00000000
 
 dlabel D_80241F18_AF4BB8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, tik_07_FlyingAI_JumpVels, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802405F8_AF3298, 0xFE363C80, 0x0000004E, 0x00000006, D_80241F18_AF4BB8, 0x00000010, 0x00000000, kkj_18_D_80244CB0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802420AC_AF4D4C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_18_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802405C0_AF3260, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240694_AF3334, 0xFE363C80, 0x0000004E, 0x00000006, D_802420AC_AF4D4C, 0x00000010, 0x00000000, kkj_18_D_80244E78, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024056C_AF320C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242230_AF4ED0
 .word 0xC1B80000, 0x41F00000, 0x42100000, 0x41800000, 0x42780000, 0xC1200000, 0x42800000, 0x425C0000, 0x40A00000, 0x42E00000, 0x42380000, 0x41A00000, 0x43200000, 0x42700000, 0xC1C80000

ver/us/asm/data/world/area_kkj/kkj_19/AF9460.data.s

@@ -9,7 +9,7 @@ dlabel D_80241B14_AF9464
 .word 0x00000000
 
 dlabel D_80241B18_AF9468
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240568_AF7EB8, 0xFE363C80, 0x0000004E, 0x00000006, D_80241B18_AF9468, 0x00000010, 0x00000000, kkj_19_D_802461F0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80241CAC_AF95FC
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kkj_19_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240530_AF7E80, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240604_AF7F54, 0xFE363C80, 0x0000004E, 0x00000006, D_80241CAC_AF95FC, 0x00000010, 0x00000000, D_802463B8_kkj_19, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802404DC_AF7E2C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s

@@ -114,7 +114,7 @@ dlabel D_80247E34_8B7EA4
 .word 0x00000000
 
 dlabel D_80247E38_8B7EA8
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247FCC_8B803C
 .word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001
@@ -147,7 +147,7 @@ dlabel D_802481D4_8B8244
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802422C0_8B2330, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802484F8_8B8568
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248568_8B85D8
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802484F8_8B8568, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_kmr/kmr_11/8E0190.data.s

@@ -5,7 +5,7 @@
 dlabel D_80246090_8E0190
 .word 0x00000000, 0x00000000, 0x00000000, 0x42C80000, 0x42480000, 0x00000000, 0x43480000, 0x43160000, 0x00000000, 0x437A0000, 0x43C80000, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000046, 0x00000000, 0x00000008, 0x00000043, 0x00000004, SetNpcVar, 0x00000004, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000064, 0x000000B6, 0xFFFFFE9F, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000498, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x0000003B, 0xFFFFFF61, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFFE8, 0xFFFFFF00, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000008, 0xFFFFFFFB, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000064, 0x000000BE, 0xFFFFFE9F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF24, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000064, 0x000000BE, 0xFFFFFE9F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D1A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, LoadPath, 0x00000050, D_80246090_8E0190, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000018, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000295, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000046, 0x00000001, 0x80241C24, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
-dlabel D_80246430_8E0530
+dlabel hos_06_D_80246430
 .word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_kmr_11_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_kmr_11_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80246790_8E0890
@@ -72,7 +72,7 @@ dlabel D_80246EC8_8E0FC8
 .word D_80246E7C_8E0F7C, D_80246E84_8E0F84, D_80246E8C_8E0F8C, D_80246EAC_8E0FAC, 0x00000000
 
 dlabel D_80246EDC_8E0FDC
-.word 0x43A00000, 0x00000000, 0xC3F80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DAC_8E0EAC, 0x00000047, 0x00000005, D_80246430_8E0530, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DD4_8E0ED4, 0x00000047, 0x00000005, D_80246430_8E0530, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DFC_8E0EFC, 0x00000047, 0x00000005, D_80246430_8E0530, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E58_8E0F58, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00001000, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00100000, D_80246E6C_8E0F6C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246EC8_8E0FC8, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00001000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00100000, D_80246EDC_8E0FDC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x43A00000, 0x00000000, 0xC3F80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DAC_8E0EAC, 0x00000047, 0x00000005, hos_06_D_80246430, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DD4_8E0ED4, 0x00000047, 0x00000005, hos_06_D_80246430, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246DFC_8E0EFC, 0x00000047, 0x00000005, hos_06_D_80246430, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E58_8E0F58, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00001000, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00100000, D_80246E6C_8E0F6C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246EC8_8E0FC8, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00001000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246790_8E0890, 0x00100000, D_80246EDC_8E0FDC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247010_8E1110
 .word 0x00000000, 0x00008AB5, 0x00000000, 0xC3A70000, 0xC38E8000, 0xC2EC0000, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000000, 0x001C0000

ver/us/asm/data/world/area_mac/mac_00/7F0A20.data.s

@@ -93,13 +93,13 @@ dlabel D_802483F0_7F3100
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248534_7F3244
-.word 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_802483F0_7F3100, 0x00000010, 0x00000000, D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_802483F0_7F3100, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248584_7F3294
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802486B8_7F33C8
-.word 0x00000043, 0x00000002, func_80241A18_7EC728, 0xFE363C80, 0x0000004E, 0x00000006, D_80248584_7F3294, 0x00000010, 0x00000000, D_80255D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80241A18_7EC728, 0xFE363C80, 0x0000004E, 0x00000006, D_80248584_7F3294, 0x00000010, 0x00000000, mac_00_D_80255D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248708_7F3418
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -108,7 +108,7 @@ dlabel D_80248788_7F3498
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_7F3418, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241944_7EC654, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248AAC_7F37BC
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_7F3498, 0x00000010, 0x00000000, D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024197C_7EC68C, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_7F3498, 0x00000010, 0x00000000, mac_00_D_80255BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802418F0_7EC600, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248B1C_7F382C
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80248AAC_7F37BC, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245DC4_7F0AD4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_mac/mac_01/8091F0.data.s

@@ -198,7 +198,7 @@ dlabel D_8024D94C_80E1CC
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024DA90_80E310
-.word 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024D94C_80E1CC, 0x00000010, 0x00000000, D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024D94C_80E1CC, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024DAE0_80E360
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -207,7 +207,7 @@ dlabel D_8024DB60_80E3E0
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024DAE0_80E360, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243D28_8045A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024DE84_80E704
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024DB60_80E3E0, 0x00000010, 0x00000000, D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80243D60_8045E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024DB60_80E3E0, 0x00000010, 0x00000000, mac_01_D_80262A70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243CD4_804554, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024DEF4_80E774
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_01_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024DE84_80E704, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80248C34_8094B4, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_mac/mac_02/828F10.data.s

@@ -120,13 +120,13 @@ dlabel D_80248780_82BA40
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802488C4_82BB84
-.word 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248780_82BA40, 0x00000010, 0x00000000, D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248780_82BA40, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248914_82BBD4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248A48_82BD08
-.word 0x00000043, 0x00000002, func_80242BA8_825E68, 0xFE363C80, 0x0000004E, 0x00000006, D_80248914_82BBD4, 0x00000010, 0x00000000, D_8024E738, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80242BA8_825E68, 0xFE363C80, 0x0000004E, 0x00000006, D_80248914_82BBD4, 0x00000010, 0x00000000, mac_02_D_8024E738, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248A98_82BD58
 .word 0x0000008A, 0x0000008C, 0x0000008E, 0x00000095, 0x0000008B, 0x00000080, 0x000000AC, 0x0000009D, 0x0000009C, 0x000000A4, 0x000000A3, 0x000000A2, 0x00000094, 0x0000009F, 0x0000009E, 0x000000A0, 0x000000A5, 0x000000A6, 0x000000A7, 0x000000A8, 0x000000A9, 0x000000AA, 0x000000AB, 0x000000AD, 0x000000AE, 0x000000AF, 0x0000008D, 0x000000A1, 0x00000093, 0xFFFFFFFF
@@ -180,7 +180,7 @@ dlabel D_8024A234_82D4F4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024A1B4_82D474, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242AD4_825D94, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A558_82D818
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242B0C_825DCC, 0xFE363C80, 0x0000004E, 0x00000006, D_8024A234_82D4F4, 0x00000010, 0x00000000, mac_02_D_8024E570, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242A80_825D40, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024A5C8_82D888
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_8024A558_82D818, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246154_829414, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s

@@ -105,7 +105,7 @@ dlabel D_80248C70_83A470
 .word 0x00000000
 
 dlabel D_80248C74_83A474
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248E08_83A608
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -114,7 +114,7 @@ dlabel D_80248E88_83A688
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802417C4_832FC4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802491AC_83A9AC
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024921C_83AA1C
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802491AC_83A9AC, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_mac/mac_04/8469B0.data.s

@@ -108,7 +108,7 @@ dlabel D_80246618_8491E8
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_04_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241774_844344, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024675C_84932C
-.word 0x00000043, 0x00000002, func_802417AC_84437C, 0xFE363C80, 0x0000004E, 0x00000006, D_80246618_8491E8, 0x00000010, 0x00000000, D_8024F5D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241720_8442F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_802417AC_84437C, 0xFE363C80, 0x0000004E, 0x00000006, D_80246618_8491E8, 0x00000010, 0x00000000, mac_04_D_8024F5D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241720_8442F0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802467AC_84937C
 .word 0x00000043, 0x00000004, func_802D2884, 0xFFFFFE48, 0xFFFFFF6A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000032, 0x00000026, 0x00000002, 0xFE363C85, 0x00000003, 0x00000043, 0x00000007, MakeItemEntity, 0x00000021, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C84, 0xFFFFFF6A, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetItemPos, 0xFE363C87, 0xFFFFFE48, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7880, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C87, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_mac/mac_05/857070.data.s

@@ -102,13 +102,13 @@ dlabel D_802476E0_859850
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247824_859994
-.word 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_802476E0_859850, 0x00000010, 0x00000000, D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_802476E0_859850, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247874_8599E4
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802479A8_859B18
-.word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80242708_854878, 0xFE363C80, 0x0000004E, 0x00000006, D_80247874_8599E4, 0x00000010, 0x00000000, mac_05_D_80252BC8, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802479F8_859B68
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -117,7 +117,7 @@ dlabel D_80247A78_859BE8
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_05_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802479F8_859B68, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242634_8547A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247D9C_859F0C
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_8024266C_8547DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80247A78_859BE8, 0x00000010, 0x00000000, mac_05_D_80252A00, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802425E0_854750, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80247E0C_859F7C
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80247D9C_859F0C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802450B4_857224, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_nok/nok_01/9C89E0.data.s

@@ -183,7 +183,7 @@ dlabel D_80248570_9CD950
 .word 0x00000000
 
 dlabel D_80248574_9CD954
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248574_9CD954, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248708_9CDAE8
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -192,7 +192,7 @@ dlabel D_80248788_9CDB68
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_01_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248708_9CDAE8, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024207C_9C745C, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248AAC_9CDE8C
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_9CDB68, 0x00000010, 0x00000000, D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802420B4_9C7494, 0xFE363C80, 0x0000004E, 0x00000006, D_80248788_9CDB68, 0x00000010, 0x00000000, nok_01_D_80251C70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242028_9C7408, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80248B1C_9CDEFC
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_01_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80248AAC_9CDE8C, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80245F48_9CB328, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_01_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_nok/nok_02/9DB6C0.data.s

@@ -18,7 +18,7 @@ dlabel D_80245438_9DC458
 .word 0x00000000
 
 dlabel D_8024543C_9DC45C
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240678_9D7698, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406B0_9D76D0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024543C_9DC45C, 0x00000010, 0x00000000, D_802547D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240624_9D7644, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240678_9D7698, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406B0_9D76D0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024543C_9DC45C, 0x00000010, 0x00000000, nok_02_D_802547D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240624_9D7644, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802455D0_9DC5F0
 .word 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80254600, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s

@@ -120,7 +120,7 @@ dlabel D_802496F8_9E0718
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024983C_9E085C
-.word 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_802496F8_9E0718, 0x00000010, 0x00000000, D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_802496F8_9E0718, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8024988C_9E08AC
 .word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000
@@ -132,7 +132,7 @@ dlabel D_80249954_9E0974
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, nok_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802498D4_9E08F4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80242C24_9D9C44, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80249C78_9E0C98
-.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_80249954_9E0974, 0x00000010, 0x00000000, D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80242C5C_9D9C7C, 0xFE363C80, 0x0000004E, 0x00000006, D_80249954_9E0974, 0x00000010, 0x00000000, nok_02_D_802549D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80242BD0_9D9BF0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80249CE8_9E0D08
 .word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_80249C78_9E0C98, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802470CC_9DE0EC, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, nok_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/data/world/area_nok/nok_02/9E9420.data.s

@@ -12,13 +12,13 @@ dlabel D_80252408_9E9428
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243C40_9DAC60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8025254C_9E956C
-.word 0x00000043, 0x00000002, func_80243C78_9DAC98, 0xFE363C80, 0x0000004E, 0x00000006, D_80252408_9E9428, 0x00000010, 0x00000000, D_80254BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80243C78_9DAC98, 0xFE363C80, 0x0000004E, 0x00000006, D_80252408_9E9428, 0x00000010, 0x00000000, nok_02_D_80254BA0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_8025259C_9E95BC
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, dup2_nok_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80243C40_9DAC60, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802526D0_9E96F0
-.word 0x00000043, 0x00000002, func_80243D14_9DAD34, 0xFE363C80, 0x0000004E, 0x00000006, D_8025259C_9E95BC, 0x00000010, 0x00000000, D_80254D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_80243D14_9DAD34, 0xFE363C80, 0x0000004E, 0x00000006, D_8025259C_9E95BC, 0x00000010, 0x00000000, nok_02_D_80254D68, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80243BEC_9DAC0C, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel dup2_nok_02_varStash
 .word 0x00000000

ver/us/asm/data/world/area_sbk/sbk_02/92E220.data.s

@@ -18,7 +18,7 @@ dlabel D_80244054_92E304
 .word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80240970_92AC20, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80244188_92E438
-.word 0x00000043, 0x00000002, func_802409A8_92AC58, 0xFE363C80, 0x0000004E, 0x00000006, D_80244054_92E304, 0x00000010, 0x00000000, D_80245630, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024091C_92ABCC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000043, 0x00000002, func_802409A8_92AC58, 0xFE363C80, 0x0000004E, 0x00000006, D_80244054_92E304, 0x00000010, 0x00000000, sbk_02_D_80245630, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024091C_92ABCC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel sbk_02_varStash
 .word 0x00000000

ver/us/asm/data/world/area_sbk/sbk_30/940DC0.data.s

@@ -57,7 +57,7 @@ dlabel D_802421A4_941754
 .word 0x00000043, 0x00000002, func_802411AC_94075C, 0xFE363C80, 0x0000004E, 0x00000006, D_80242060_941610, 0x00000010, 0x00000000, btl_state_update_end_battle, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_802421F4_9417A4
-.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_30_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241174_940724, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241248_9407F8, 0xFE363C80, 0x0000004E, 0x00000006, D_802421F4_9417A4, 0x00000010, 0x00000000, D_80244C18, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
+.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowConsumableChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_30_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241174_940724, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80241248_9407F8, 0xFE363C80, 0x0000004E, 0x00000006, D_802421F4_9417A4, 0x00000010, 0x00000000, sbk_30_D_80244C18, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241120_9406D0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 dlabel D_80242378_941928
 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_30_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000

ver/us/asm/nonmatchings/39210_len_aa0/func_8005DECC.s

@@ -1,73 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8005DECC
-/* 392CC 8005DECC 27BDFFD0 */  addiu     $sp, $sp, -0x30
-/* 392D0 8005DED0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 392D4 8005DED4 0080882D */  daddu     $s1, $a0, $zero
-/* 392D8 8005DED8 AFB20018 */  sw        $s2, 0x18($sp)
-/* 392DC 8005DEDC 00A0902D */  daddu     $s2, $a1, $zero
-/* 392E0 8005DEE0 AFB3001C */  sw        $s3, 0x1c($sp)
-/* 392E4 8005DEE4 00C0982D */  daddu     $s3, $a2, $zero
-/* 392E8 8005DEE8 F7B40028 */  sdc1      $f20, 0x28($sp)
-/* 392EC 8005DEEC 4487A000 */  mtc1      $a3, $f20
-/* 392F0 8005DEF0 240402A4 */  addiu     $a0, $zero, 0x2a4
-/* 392F4 8005DEF4 AFBF0020 */  sw        $ra, 0x20($sp)
-/* 392F8 8005DEF8 0C00AB39 */  jal       heap_malloc
-/* 392FC 8005DEFC AFB00010 */   sw       $s0, 0x10($sp)
-/* 39300 8005DF00 0040202D */  daddu     $a0, $v0, $zero
-/* 39304 8005DF04 3C108011 */  lui       $s0, %hi(gPlayerStatus)
-/* 39308 8005DF08 2610EFC8 */  addiu     $s0, $s0, %lo(gPlayerStatus)
-/* 3930C 8005DF0C 14800003 */  bnez      $a0, .L8005DF1C
-/* 39310 8005DF10 AE240020 */   sw       $a0, 0x20($s1)
-.L8005DF14:
-/* 39314 8005DF14 080177C5 */  j         .L8005DF14
-/* 39318 8005DF18 00000000 */   nop
-.L8005DF1C:
-/* 3931C 8005DF1C 0000282D */  daddu     $a1, $zero, $zero
-/* 39320 8005DF20 0080182D */  daddu     $v1, $a0, $zero
-.L8005DF24:
-/* 39324 8005DF24 C6000028 */  lwc1      $f0, 0x28($s0)
-/* 39328 8005DF28 E4600004 */  swc1      $f0, 4($v1)
-/* 3932C 8005DF2C C600002C */  lwc1      $f0, 0x2c($s0)
-/* 39330 8005DF30 24A50001 */  addiu     $a1, $a1, 1
-/* 39334 8005DF34 E4600008 */  swc1      $f0, 8($v1)
-/* 39338 8005DF38 C6000030 */  lwc1      $f0, 0x30($s0)
-/* 3933C 8005DF3C 28A20028 */  slti      $v0, $a1, 0x28
-/* 39340 8005DF40 A0600000 */  sb        $zero, ($v1)
-/* 39344 8005DF44 E460000C */  swc1      $f0, 0xc($v1)
-/* 39348 8005DF48 1440FFF6 */  bnez      $v0, .L8005DF24
-/* 3934C 8005DF4C 24630010 */   addiu    $v1, $v1, 0x10
-/* 39350 8005DF50 AC800280 */  sw        $zero, 0x280($a0)
-/* 39354 8005DF54 AC800284 */  sw        $zero, 0x284($a0)
-/* 39358 8005DF58 AC800288 */  sw        $zero, 0x288($a0)
-/* 3935C 8005DF5C AC92028C */  sw        $s2, 0x28c($a0)
-/* 39360 8005DF60 AC930290 */  sw        $s3, 0x290($a0)
-/* 39364 8005DF64 E4940294 */  swc1      $f20, 0x294($a0)
-/* 39368 8005DF68 C7A00040 */  lwc1      $f0, 0x40($sp)
-/* 3936C 8005DF6C 0260102D */  daddu     $v0, $s3, $zero
-/* 39370 8005DF70 E4800298 */  swc1      $f0, 0x298($a0)
-/* 39374 8005DF74 C7A00044 */  lwc1      $f0, 0x44($sp)
-/* 39378 8005DF78 46800020 */  cvt.s.w   $f0, $f0
-/* 3937C 8005DF7C E480029C */  swc1      $f0, 0x29c($a0)
-/* 39380 8005DF80 C7A00048 */  lwc1      $f0, 0x48($sp)
-/* 39384 8005DF84 46800020 */  cvt.s.w   $f0, $f0
-/* 39388 8005DF88 E48002A0 */  swc1      $f0, 0x2a0($a0)
-/* 3938C 8005DF8C 8C440010 */  lw        $a0, 0x10($v0)
-/* 39390 8005DF90 8E220000 */  lw        $v0, ($s1)
-/* 39394 8005DF94 2403FEFF */  addiu     $v1, $zero, -0x101
-/* 39398 8005DF98 AE20001C */  sw        $zero, 0x1c($s1)
-/* 3939C 8005DF9C 34420200 */  ori       $v0, $v0, 0x200
-/* 393A0 8005DFA0 00431024 */  and       $v0, $v0, $v1
-/* 393A4 8005DFA4 AE220000 */  sw        $v0, ($s1)
-/* 393A8 8005DFA8 3C020001 */  lui       $v0, 1
-/* 393AC 8005DFAC AE220080 */  sw        $v0, 0x80($s1)
-/* 393B0 8005DFB0 AE240028 */  sw        $a0, 0x28($s1)
-/* 393B4 8005DFB4 8FBF0020 */  lw        $ra, 0x20($sp)
-/* 393B8 8005DFB8 8FB3001C */  lw        $s3, 0x1c($sp)
-/* 393BC 8005DFBC 8FB20018 */  lw        $s2, 0x18($sp)
-/* 393C0 8005DFC0 8FB10014 */  lw        $s1, 0x14($sp)
-/* 393C4 8005DFC4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 393C8 8005DFC8 D7B40028 */  ldc1      $f20, 0x28($sp)
-/* 393CC 8005DFCC 03E00008 */  jr        $ra
-/* 393D0 8005DFD0 27BD0030 */   addiu    $sp, $sp, 0x30

ver/us/asm/nonmatchings/39210_len_aa0/func_8005DFD4.s

@@ -1,95 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8005DFD4
-/* 393D4 8005DFD4 27BDFFC0 */  addiu     $sp, $sp, -0x40
-/* 393D8 8005DFD8 AFB20030 */  sw        $s2, 0x30($sp)
-/* 393DC 8005DFDC 0080902D */  daddu     $s2, $a0, $zero
-/* 393E0 8005DFE0 27A6001C */  addiu     $a2, $sp, 0x1c
-/* 393E4 8005DFE4 27A70020 */  addiu     $a3, $sp, 0x20
-/* 393E8 8005DFE8 AFBF0038 */  sw        $ra, 0x38($sp)
-/* 393EC 8005DFEC AFB30034 */  sw        $s3, 0x34($sp)
-/* 393F0 8005DFF0 AFB1002C */  sw        $s1, 0x2c($sp)
-/* 393F4 8005DFF4 AFB00028 */  sw        $s0, 0x28($sp)
-/* 393F8 8005DFF8 8E510020 */  lw        $s1, 0x20($s2)
-/* 393FC 8005DFFC 27A20024 */  addiu     $v0, $sp, 0x24
-/* 39400 8005E000 AFA20010 */  sw        $v0, 0x10($sp)
-/* 39404 8005E004 8E24028C */  lw        $a0, 0x28c($s1)
-/* 39408 8005E008 0C017784 */  jal       get_npc_pos
-/* 3940C 8005E00C 27A50018 */   addiu    $a1, $sp, 0x18
-/* 39410 8005E010 8E220280 */  lw        $v0, 0x280($s1)
-/* 39414 8005E014 00021100 */  sll       $v0, $v0, 4
-/* 39418 8005E018 02228021 */  addu      $s0, $s1, $v0
-/* 3941C 8005E01C 8FA20024 */  lw        $v0, 0x24($sp)
-/* 39420 8005E020 82030000 */  lb        $v1, ($s0)
-/* 39424 8005E024 10600003 */  beqz      $v1, .L8005E034
-/* 39428 8005E028 0002982B */   sltu     $s3, $zero, $v0
-/* 3942C 8005E02C 16600038 */  bnez      $s3, .L8005E110
-/* 39430 8005E030 00000000 */   nop
-.L8005E034:
-/* 39434 8005E034 1660000E */  bnez      $s3, .L8005E070
-/* 39438 8005E038 00000000 */   nop
-/* 3943C 8005E03C 8FA60018 */  lw        $a2, 0x18($sp)
-/* 39440 8005E040 8FA70020 */  lw        $a3, 0x20($sp)
-/* 39444 8005E044 C64C0038 */  lwc1      $f12, 0x38($s2)
-/* 39448 8005E048 0C00A7B5 */  jal       dist2D
-/* 3944C 8005E04C C64E0040 */   lwc1     $f14, 0x40($s2)
-/* 39450 8005E050 C622029C */  lwc1      $f2, 0x29c($s1)
-/* 39454 8005E054 4602003E */  c.le.s    $f0, $f2
-/* 39458 8005E058 00000000 */  nop
-/* 3945C 8005E05C 45000004 */  bc1f      .L8005E070
-/* 39460 8005E060 00000000 */   nop
-/* 39464 8005E064 82020000 */  lb        $v0, ($s0)
-/* 39468 8005E068 10400029 */  beqz      $v0, .L8005E110
-/* 3946C 8005E06C 00000000 */   nop
-.L8005E070:
-/* 39470 8005E070 8E220280 */  lw        $v0, 0x280($s1)
-/* 39474 8005E074 C7A00018 */  lwc1      $f0, 0x18($sp)
-/* 39478 8005E078 00021100 */  sll       $v0, $v0, 4
-/* 3947C 8005E07C 02228021 */  addu      $s0, $s1, $v0
-/* 39480 8005E080 C6020004 */  lwc1      $f2, 4($s0)
-/* 39484 8005E084 46001032 */  c.eq.s    $f2, $f0
-/* 39488 8005E088 00000000 */  nop
-/* 3948C 8005E08C 4500000D */  bc1f      .L8005E0C4
-/* 39490 8005E090 00000000 */   nop
-/* 39494 8005E094 C6020008 */  lwc1      $f2, 8($s0)
-/* 39498 8005E098 C7A0001C */  lwc1      $f0, 0x1c($sp)
-/* 3949C 8005E09C 46001032 */  c.eq.s    $f2, $f0
-/* 394A0 8005E0A0 00000000 */  nop
-/* 394A4 8005E0A4 45000007 */  bc1f      .L8005E0C4
-/* 394A8 8005E0A8 00000000 */   nop
-/* 394AC 8005E0AC C602000C */  lwc1      $f2, 0xc($s0)
-/* 394B0 8005E0B0 C7A00020 */  lwc1      $f0, 0x20($sp)
-/* 394B4 8005E0B4 46001032 */  c.eq.s    $f2, $f0
-/* 394B8 8005E0B8 00000000 */  nop
-/* 394BC 8005E0BC 45010014 */  bc1t      .L8005E110
-/* 394C0 8005E0C0 00000000 */   nop
-.L8005E0C4:
-/* 394C4 8005E0C4 8E220280 */  lw        $v0, 0x280($s1)
-/* 394C8 8005E0C8 8E230284 */  lw        $v1, 0x284($s1)
-/* 394CC 8005E0CC 24420001 */  addiu     $v0, $v0, 1
-/* 394D0 8005E0D0 1062000F */  beq       $v1, $v0, .L8005E110
-/* 394D4 8005E0D4 00000000 */   nop
-/* 394D8 8005E0D8 AE220280 */  sw        $v0, 0x280($s1)
-/* 394DC 8005E0DC 28420028 */  slti      $v0, $v0, 0x28
-/* 394E0 8005E0E0 50400001 */  beql      $v0, $zero, .L8005E0E8
-/* 394E4 8005E0E4 AE200280 */   sw       $zero, 0x280($s1)
-.L8005E0E8:
-/* 394E8 8005E0E8 8E220280 */  lw        $v0, 0x280($s1)
-/* 394EC 8005E0EC C7A00018 */  lwc1      $f0, 0x18($sp)
-/* 394F0 8005E0F0 C7A2001C */  lwc1      $f2, 0x1c($sp)
-/* 394F4 8005E0F4 C7A40020 */  lwc1      $f4, 0x20($sp)
-/* 394F8 8005E0F8 00021100 */  sll       $v0, $v0, 4
-/* 394FC 8005E0FC 02228021 */  addu      $s0, $s1, $v0
-/* 39500 8005E100 E6000004 */  swc1      $f0, 4($s0)
-/* 39504 8005E104 E6020008 */  swc1      $f2, 8($s0)
-/* 39508 8005E108 E604000C */  swc1      $f4, 0xc($s0)
-/* 3950C 8005E10C A2130000 */  sb        $s3, ($s0)
-.L8005E110:
-/* 39510 8005E110 8FBF0038 */  lw        $ra, 0x38($sp)
-/* 39514 8005E114 8FB30034 */  lw        $s3, 0x34($sp)
-/* 39518 8005E118 8FB20030 */  lw        $s2, 0x30($sp)
-/* 3951C 8005E11C 8FB1002C */  lw        $s1, 0x2c($sp)
-/* 39520 8005E120 8FB00028 */  lw        $s0, 0x28($sp)
-/* 39524 8005E124 03E00008 */  jr        $ra
-/* 39528 8005E128 27BD0040 */   addiu    $sp, $sp, 0x40